diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-06-28 16:59:45 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-27 14:51:00 +0100 |
commit | 0fea8f5ee0193f523428cb05d9fa9d0084213d4c (patch) | |
tree | 11a951d8d2d7b0d45382bf42cede78a052a31024 /lib/devres.c | |
parent | 67a358b01e2edfd824360e8c366b819f0756f79d (diff) | |
download | linux-stable-0fea8f5ee0193f523428cb05d9fa9d0084213d4c.tar.gz linux-stable-0fea8f5ee0193f523428cb05d9fa9d0084213d4c.tar.bz2 linux-stable-0fea8f5ee0193f523428cb05d9fa9d0084213d4c.zip |
devres: allow const resource arguments
[ 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>
Diffstat (limited to 'lib/devres.c')
-rw-r--r-- | lib/devres.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/devres.c b/lib/devres.c index faccf1a037d0..aa0f5308ac6b 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; |