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.
The first patch in this series adds a wrapper for these two calls and
the other uses it in a driver.
v3 -> v4:
- modified the description of a parameter res in patch 1.
- modified patch 5's commit comment.
v2 -> v3:
- rename the function to
devm_platform_get_and_ioremap_resource() by Sergei's suggestion.
- make the last parameter res as optional by Geert's suggestion.
- Reimplement devm_platform_ioremap_resource by calling
devm_platform_get_and_ioremap_resource() by Geert's suggestion.
v1 -> v2:
- add some real users of this function (Thanks for greg k-h's reminder)
Dejin Zheng (5):
drivers: provide devm_platform_get_and_ioremap_resource()
usb: host: xhci-plat: convert to
devm_platform_get_and_ioremap_resource
usb: host: hisilicon: convert to
devm_platform_get_and_ioremap_resource
usb: dwc2: convert to devm_platform_get_and_ioremap_resource
driver core: platform: Reimplement devm_platform_ioremap_resource
drivers/base/platform.c | 27 +++++++++++++++++++++++----
drivers/usb/dwc2/platform.c | 3 +--
drivers/usb/host/xhci-histb.c | 3 +--
drivers/usb/host/xhci-plat.c | 3 +--
include/linux/platform_device.h | 3 +++
5 files changed, 29 insertions(+), 10 deletions(-)
--
2.25.0
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 <[email protected]>
Suggested-by: Sergei Shtylyov <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Dejin Zheng <[email protected]>
---
v3 -> v4:
- modified the description of the parameter res in this patch.
v2 -> v3:
- rename the function to
devm_platform_get_and_ioremap_resource() by Sergei's suggestion.
- make the last parameter res as optional by Geert's suggestion.
v1 -> v2:
- No change.
drivers/base/platform.c | 22 ++++++++++++++++++++++
include/linux/platform_device.h | 3 +++
2 files changed, 25 insertions(+)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 7fa654f1288b..3e8a9fb91dcd 100644
--- 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
+/**
+ * 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
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 8e83c6ff140d..8aa6b448450f 100644
--- 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 *
+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 *
--
2.25.0
Use devm_platform_get_and_ioremap_resource() to simplify code, which
contains platform_get_resource() and devm_ioremap_resource(), it also
get the resource for use by the following code.
Reviewed-by: Geert Uytterhoeven <[email protected]>
Acked-by: Mathias Nyman <[email protected]>
Signed-off-by: Dejin Zheng <[email protected]>
---
v3 -> v4:
- no changed.
v2 -> v3:
- call the rename function devm_platform_get_and_ioremap_resource()
v1 -> v2:
- add this patch for add some real users of this function.
drivers/usb/host/xhci-plat.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index d90cd5ec09cf..dcc0bfe04c43 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -219,8 +219,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
goto disable_runtime;
}
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+ hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(hcd->regs)) {
ret = PTR_ERR(hcd->regs);
goto put_hcd;
--
2.25.0
Use devm_platform_get_and_ioremap_resource() to simplify code, which
contains platform_get_resource() and devm_ioremap_resource(), it also
get the resource for use by the following code.
Reviewed-by: Geert Uytterhoeven <[email protected]>
Acked-by: Mathias Nyman <[email protected]>
Signed-off-by: Dejin Zheng <[email protected]>
---
v3 -> v4:
- no changed.
v2 -> v3:
- call the rename function devm_platform_get_and_ioremap_resource()
v1 -> v2:
- add this patch for add some real users of this function.
drivers/usb/host/xhci-histb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci-histb.c b/drivers/usb/host/xhci-histb.c
index 3c4abb5a1c3f..5546e7e013a8 100644
--- a/drivers/usb/host/xhci-histb.c
+++ b/drivers/usb/host/xhci-histb.c
@@ -219,8 +219,7 @@ static int xhci_histb_probe(struct platform_device *pdev)
if (irq < 0)
return irq;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- histb->ctrl = devm_ioremap_resource(&pdev->dev, res);
+ histb->ctrl = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(histb->ctrl))
return PTR_ERR(histb->ctrl);
--
2.25.0
Reimplement devm_platform_ioremap_resource() by calling
devm_platform_ioremap_and_get_resource() with res = NULL to
simplify the code.
Suggested-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Dejin Zheng <[email protected]>
---
v3 -> v4:
- modified this patch's commit comment.
v2 -> v3:
- add this patch to simplify the code by Geert's suggestion.
drivers/base/platform.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 3e8a9fb91dcd..16b54ebc6958 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -95,10 +95,7 @@ EXPORT_SYMBOL_GPL(devm_platform_get_and_ioremap_resource);
void __iomem *devm_platform_ioremap_resource(struct platform_device *pdev,
unsigned int index)
{
- struct resource *res;
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, index);
- return devm_ioremap_resource(&pdev->dev, res);
+ return devm_platform_get_and_ioremap_resource(pdev, index, NULL);
}
EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource);
--
2.25.0
Use devm_platform_get_and_ioremap_resource() to simplify code, which
contains platform_get_resource() and devm_ioremap_resource(), it also
get the resource for use by the following code.
Reviewed-by: Geert Uytterhoeven <[email protected]>
Acked-by: Minas Harutyunyan <[email protected]>
Signed-off-by: Dejin Zheng <[email protected]>
---
v2 -> v3:
- no changed.
v2 -> v3:
- call the rename function devm_platform_get_and_ioremap_resource()
v1 -> v2:
- add this patch for add some real users of this function.
drivers/usb/dwc2/platform.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 3c6ce09a6db5..8a68e89749d2 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -392,8 +392,7 @@ static int dwc2_driver_probe(struct platform_device *dev)
return retval;
}
- res = platform_get_resource(dev, IORESOURCE_MEM, 0);
- hsotg->regs = devm_ioremap_resource(&dev->dev, res);
+ hsotg->regs = devm_platform_get_and_ioremap_resource(dev, 0, &res);
if (IS_ERR(hsotg->regs))
return PTR_ERR(hsotg->regs);
--
2.25.0