drivers: provide devm_platform_get_and_ioremap_resource()

Since commit "drivers: provide devm_platform_ioremap_resource()",
it was wrap platform_get_resource() and devm_ioremap_resource() as
single helper devm_platform_ioremap_resource(). but now, many drivers
still used platform_get_resource() and devm_ioremap_resource()
together in the kernel tree. The reason can not be replaced is they
still need use the resource variables obtained by platform_get_resource().
so provide this helper.

Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Link: https://lore.kernel.org/r/20200323160612.17277-2-zhengdejin5@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index b5ce7b0857953e32c90743c39b920a9f61a89f2a..8f0f62bdc58ef42afb91406bc8972249eaed5202 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -62,6 +62,28 @@ struct resource *platform_get_resource(struct platform_device *dev,
 EXPORT_SYMBOL_GPL(platform_get_resource);
 
 #ifdef CONFIG_HAS_IOMEM
 EXPORT_SYMBOL_GPL(platform_get_resource);
 
 #ifdef CONFIG_HAS_IOMEM

+/**
+ * devm_platform_get_and_ioremap_resource - call devm_ioremap_resource() for a
+ *                                         platform device and get resource
+ *
+ * @pdev: platform device to use both for memory resource lookup as well as
+ *        resource management
+ * @index: resource index
+ * @res: optional output parameter to store a pointer to the obtained resource.
+ */
+void __iomem *
+devm_platform_get_and_ioremap_resource(struct platform_device *pdev,
+                               unsigned int index, struct resource **res)
+{
+       struct resource *r;
+
+       r = platform_get_resource(pdev, IORESOURCE_MEM, index);
+       if (res)
+               *res = r;
+       return devm_ioremap_resource(&pdev->dev, r);
+}
+EXPORT_SYMBOL_GPL(devm_platform_get_and_ioremap_resource);
+

 /**
  * devm_platform_ioremap_resource - call devm_ioremap_resource() for a platform
  *                                 device
 /**
  * devm_platform_ioremap_resource - call devm_ioremap_resource() for a platform
  *                                 device

diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 041bfa412aa09521813c057fbfc3f273dfda062b..f242f66db19d525a4b370c6cf08717383a099889 100644 (file)
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -55,6 +55,9 @@ extern struct device *
 platform_find_device_by_driver(struct device *start,
                               const struct device_driver *drv);
 extern void __iomem *
 platform_find_device_by_driver(struct device *start,
                               const struct device_driver *drv);
 extern void __iomem *

+devm_platform_get_and_ioremap_resource(struct platform_device *pdev,
+                               unsigned int index, struct resource **res);
+extern void __iomem *

 devm_platform_ioremap_resource(struct platform_device *pdev,
                               unsigned int index);
 extern void __iomem *
 devm_platform_ioremap_resource(struct platform_device *pdev,
                               unsigned int index);
 extern void __iomem *