Skip to contentSkip to conversation

watchdog: imx2_wdt: use devm_platform_ioremap_resource() to simplify code

PATCH In review Anson Huang 3 participants 3 messages Apr 1, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 watchdog: imx2_wdt: use devm_platform_ioremap_resource() to simplify code

Use the new helper devm_platform_ioremap_resource() which wraps the platform_get_resource() and devm_ioremap_resource() together, to simplify the code.

---
 drivers/watchdog/imx2_wdt.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/watchdog/imx2_wdt.c +1 -3
index 2b52514..1b0faa2 100644
@@ -247,7 +247,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
 {
 	struct imx2_wdt_device *wdev;
 	struct watchdog_device *wdog;
-	struct resource *res;
 	void __iomem *base;
 	int ret;
 	u32 val;
@@ -256,8 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
 	if (!wdev)
 		return -ENOMEM;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	base = devm_ioremap_resource(&pdev->dev, res);
+	base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(base))
 		return PTR_ERR(base);
 
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Anson Huang

Use the new helper devm_platform_ioremap_resource() which wraps the platform_get_resource() and devm_ioremap_resource() together, to simplify the code.

Cheers,
-Mukesh

Quoted 26 lines
---
  drivers/watchdog/imx2_wdt.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
drivers/watchdog/imx2_wdt.c +1 -3
index 2b52514..1b0faa2 100644
@@ -247,7 +247,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
  {
  	struct imx2_wdt_device *wdev;
  	struct watchdog_device *wdog;
-	struct resource *res;
  	void __iomem *base;
  	int ret;
  	u32 val;
@@ -256,8 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
  	if (!wdev)
  		return -ENOMEM;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	base = devm_ioremap_resource(&pdev->dev, res);
+	base = devm_platform_ioremap_resource(pdev, 0);
  	if (IS_ERR(base))
  		return PTR_ERR(base);
 
maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Anson Huang
Quoted 5 lines · Anson Huang

Use the new helper devm_platform_ioremap_resource() which wraps the platform_get_resource() and devm_ioremap_resource() together, to simplify the code.

Quoted 29 lines
---
 drivers/watchdog/imx2_wdt.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/watchdog/imx2_wdt.c +1 -3
index 2b52514..1b0faa2 100644
@@ -247,7 +247,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
 {
 	struct imx2_wdt_device *wdev;
 	struct watchdog_device *wdog;
-	struct resource *res;
 	void __iomem *base;
 	int ret;
 	u32 val;
@@ -256,8 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
 	if (!wdev)
 		return -ENOMEM;
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	base = devm_ioremap_resource(&pdev->dev, res);
+	base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(base))
 		return PTR_ERR(base);
 
Signature · 1 line
2.7.4