devres: allow const resource arguments
authorArnd Bergmann <>
Thu, 4 Jul 2019 22:14:45 +0000 (15:14 -0700)
committerLinus Torvalds <>
Fri, 5 Jul 2019 02:12:07 +0000 (11:12 +0900)
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 <>
Acked-by: Greg Kroah-Hartman <>
Reviewed-by: Enrico Weigelt <>
Reviewed-by: Andrew Morton <>
Cc: Greg Kroah-Hartman <>
Cc: Linus Walleij <>
Cc: Arnd Bergmann <>
Cc: "Rafael J. Wysocki" <>
Cc: Ulf Hansson <>
Cc: Andy Shevchenko <>
Cc: Heikki Krogerus <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>

index 848fc71..4a295e3 100644 (file)
@@ -704,7 +704,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,
index 69bed2f..6a0e9bd 100644 (file)
@@ -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;