lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 466/639] devres: allow const resource arguments
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit 9dea44c91469512d346e638694c22c30a5273992 ]

    devm_ioremap_resource() does not currently take 'const' arguments,
    which results in a warning from the first driver trying to do it
    anyway:

    drivers/gpio/gpio-amd-fch.c: In function 'amd_fch_gpio_probe':
    drivers/gpio/gpio-amd-fch.c:171:49: error: passing argument 2 of 'devm_ioremap_resource' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
    priv->base = devm_ioremap_resource(&pdev->dev, &amd_fch_gpio_iores);
    ^~~~~~~~~~~~~~~~~~~

    Change the prototype to allow it, as there is no real reason not to.

    Fixes: 9bb2e0452508 ("gpio: amd: Make resource struct const")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Link: https://lore.kernel.org/r/20190628150049.1108048-1-arnd@arndb.de
    Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Reviwed-By: Enrico Weigelt <info@metux.net>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/device.h | 3 ++-
    lib/devres.c | 3 ++-
    2 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/include/linux/device.h b/include/linux/device.h
    index e9d1c768f972a..c74ce473589ae 100644
    --- a/include/linux/device.h
    +++ b/include/linux/device.h
    @@ -701,7 +701,8 @@ extern unsigned long devm_get_free_pages(struct device *dev,
    gfp_t gfp_mask, unsigned int order);
    extern void devm_free_pages(struct device *dev, unsigned long addr);

    -void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
    +void __iomem *devm_ioremap_resource(struct device *dev,
    + const struct resource *res);

    void __iomem *devm_of_iomap(struct device *dev,
    struct device_node *node, int index,
    diff --git a/lib/devres.c b/lib/devres.c
    index faccf1a037d05..aa0f5308ac6be 100644
    --- a/lib/devres.c
    +++ b/lib/devres.c
    @@ -131,7 +131,8 @@ EXPORT_SYMBOL(devm_iounmap);
    * if (IS_ERR(base))
    * return PTR_ERR(base);
    */
    -void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
    +void __iomem *devm_ioremap_resource(struct device *dev,
    + const struct resource *res)
    {
    resource_size_t size;
    const char *name;
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:27    [W:2.852 / U:0.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site