| From 4398e68e186d0d6e390cd00115125cebb4957f71 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 28 Jun 2019 16:59:45 +0200 |
| Subject: devres: allow const resource arguments |
| |
| 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 8d732965fab77..eb865b461acc4 100644 |
| --- a/include/linux/device.h |
| +++ b/include/linux/device.h |
| @@ -682,7 +682,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); |
| |
| /* allows to add/remove a custom action to devres stack */ |
| int devm_add_action(struct device *dev, void (*action)(void *), void *data); |
| diff --git a/lib/devres.c b/lib/devres.c |
| index cb1464c411a2b..38912892053c0 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 |
| |