archive mirror
 help / color / mirror / Atom feed
* [PATCH] devres: allow const resource arguments
@ 2019-06-28 14:59 Arnd Bergmann
  2019-06-28 15:12 ` Greg Kroah-Hartman
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Arnd Bergmann @ 2019-06-28 14:59 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Linus Walleij
  Cc: Arnd Bergmann, Enrico Weigelt, Rafael J. Wysocki, Ulf Hansson,
	Andrew Morton, Andy Shevchenko, Heikki Krogerus, linux-kernel

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

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 <>
The warning is currently in Linus Walleij's gpio tree, so I would
suggest he can queue up this fix as well, if Greg (or whoever
feels responsible for devres) agrees.
 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 4f65c424e5fd..f4ff92a6a56e 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -705,7 +705,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 69bed2f38306..6a0e9bd6524a 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;
 	void __iomem *dest_ptr;

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-07-03  8:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-28 14:59 [PATCH] devres: allow const resource arguments Arnd Bergmann
2019-06-28 15:12 ` Greg Kroah-Hartman
2019-07-02 20:26 ` Enrico Weigelt, metux IT consult
2019-07-03  8:09 ` Linus Walleij

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).