[PATCH v2] ARM: pxa: ssp: Use devm_ioremap_resource instead of devm_ioremap

Subsystems: arm port, the rest

STALE4102d

2 messages, 2 authors, 2015-06-08 · open the first message on its own page

[PATCH v2] ARM: pxa: ssp: Use devm_ioremap_resource instead of devm_ioremap

From: Firo Yang <hidden>
Date: 2015-06-08 09:16:57

Using devm_ioremap_resource() API to simplify the code.

Signed-off-by: Firo Yang <redacted>
---
According to Julia's advices:

The patch "[PATCH v2] ARM: pxa: ssp: remove unnessary free for devm_xxx"
submited by Firo Yang should be discard. It was obsoleted by
"[PATCH] ARM: pxa: ssp: remove unnessary free for devm_xxx"
and
"[PATCH v2] ARM: pxa: ssp: Use devm_ioremap_resource instead of devm_ioremap"

I am not sure whether it was clear. If there is any doubt, please
 email me.
 arch/arm/plat-pxa/ssp.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c
index ad9529c..d8f331c 100644
--- a/arch/arm/plat-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
@@ -177,26 +177,12 @@ static int pxa_ssp_probe(struct platform_device *pdev)
 	}
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (res == NULL) {
-		dev_err(dev, "no memory resource defined\n");
-		return -ENODEV;
-	}
-
-	res = devm_request_mem_region(dev, res->start, resource_size(res),
-				      pdev->name);
-	if (res == NULL) {
-		dev_err(dev, "failed to request memory resource\n");
-		return -EBUSY;
-	}
+	ssp->mmio_base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(ssp->mmio_base))
+		return PTR_ERR(ssp->mmio_base);
 
 	ssp->phys_base = res->start;
 
-	ssp->mmio_base = devm_ioremap(dev, res->start, resource_size(res));
-	if (ssp->mmio_base == NULL) {
-		dev_err(dev, "failed to ioremap() registers\n");
-		return -ENODEV;
-	}
-
 	ssp->irq = platform_get_irq(pdev, 0);
 	if (ssp->irq < 0) {
 		dev_err(dev, "no IRQ resource defined\n");
-- 
2.4.2

[PATCH v2] ARM: pxa: ssp: Use devm_ioremap_resource instead of devm_ioremap

From: daniel@zonque.org (Daniel Mack)
Date: 2015-06-08 09:23:53

On 06/08/2015 11:16 AM, Firo Yang wrote:
Using devm_ioremap_resource() API to simplify the code.

Signed-off-by: Firo Yang <redacted>
This one looks good to me now, thanks!

Reviewed-by: Daniel Mack <daniel@zonque.org>


quoted hunk
---
According to Julia's advices:

The patch "[PATCH v2] ARM: pxa: ssp: remove unnessary free for devm_xxx"
submited by Firo Yang should be discard. It was obsoleted by
"[PATCH] ARM: pxa: ssp: remove unnessary free for devm_xxx"
and
"[PATCH v2] ARM: pxa: ssp: Use devm_ioremap_resource instead of devm_ioremap"

I am not sure whether it was clear. If there is any doubt, please
 email me.
 arch/arm/plat-pxa/ssp.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c
index ad9529c..d8f331c 100644
--- a/arch/arm/plat-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
@@ -177,26 +177,12 @@ static int pxa_ssp_probe(struct platform_device *pdev)
 	}
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (res == NULL) {
-		dev_err(dev, "no memory resource defined\n");
-		return -ENODEV;
-	}
-
-	res = devm_request_mem_region(dev, res->start, resource_size(res),
-				      pdev->name);
-	if (res == NULL) {
-		dev_err(dev, "failed to request memory resource\n");
-		return -EBUSY;
-	}
+	ssp->mmio_base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(ssp->mmio_base))
+		return PTR_ERR(ssp->mmio_base);
 
 	ssp->phys_base = res->start;
 
-	ssp->mmio_base = devm_ioremap(dev, res->start, resource_size(res));
-	if (ssp->mmio_base == NULL) {
-		dev_err(dev, "failed to ioremap() registers\n");
-		return -ENODEV;
-	}
-
 	ssp->irq = platform_get_irq(pdev, 0);
 	if (ssp->irq < 0) {
 		dev_err(dev, "no IRQ resource defined\n");
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help