Skip to contentSkip to conversation

dma: mxs-dma: Convert to devm_ioremap_resource()

PATCH In review Fabio Estevam 2 participants 3 messages Mar 11, 2013 – Mar 12, 2013

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 dma: mxs-dma: Convert to devm_ioremap_resource()

Converting to devm_ioremap_resource() can make the code cleaner and smaller.

---
 drivers/dma/mxs-dma.c |   18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)
drivers/dma/mxs-dma.c +4 -14
index 8f6d30d..8a9939e4 100644
@@ -689,16 +689,9 @@ static int __init mxs_dma_probe(struct platform_device *pdev)
 	mxs_dma->dev_id = dma_type->id;
 
 	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-	if (!request_mem_region(iores->start, resource_size(iores),
-				pdev->name)) {
-		ret = -EBUSY;
-		goto err_request_region;
-	}
-
-	mxs_dma->base = ioremap(iores->start, resource_size(iores));
-	if (!mxs_dma->base) {
-		ret = -ENOMEM;
+	mxs_dma->base = devm_ioremap_resource(&pdev->dev, iores);
+	if (IS_ERR(mxs_dma->base)) {
+		ret = PTR_ERR(mxs_dma->base);
 		goto err_ioremap;
 	}
 
@@ -761,10 +754,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev)
 err_init:
 	clk_put(mxs_dma->clk);
 err_clk:
-	iounmap(mxs_dma->base);
-err_ioremap:
-	release_mem_region(iores->start, resource_size(iores));
-err_request_region:
+err_ioremap:
 	kfree(mxs_dma);
 	return ret;
 }
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 2 lines · Fabio Estevam

Converting to devm_ioremap_resource() can make the code cleaner and smaller.

While you are there, you may want to use devm_kzalloc() and devm_clk_get() as well.

Shawn

Quoted 44 lines
---
 drivers/dma/mxs-dma.c |   18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)
drivers/dma/mxs-dma.c +4 -14
index 8f6d30d..8a9939e4 100644
@@ -689,16 +689,9 @@ static int __init mxs_dma_probe(struct platform_device *pdev)
 	mxs_dma->dev_id = dma_type->id;
 
 	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-	if (!request_mem_region(iores->start, resource_size(iores),
-				pdev->name)) {
-		ret = -EBUSY;
-		goto err_request_region;
-	}
-
-	mxs_dma->base = ioremap(iores->start, resource_size(iores));
-	if (!mxs_dma->base) {
-		ret = -ENOMEM;
+	mxs_dma->base = devm_ioremap_resource(&pdev->dev, iores);
+	if (IS_ERR(mxs_dma->base)) {
+		ret = PTR_ERR(mxs_dma->base);
 		goto err_ioremap;
 	}
 
@@ -761,10 +754,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev)
 err_init:
 	clk_put(mxs_dma->clk);
 err_clk:
-	iounmap(mxs_dma->base);
-err_ioremap:
-	release_mem_region(iores->start, resource_size(iores));
-err_request_region:
+err_ioremap:
 	kfree(mxs_dma);
 	return ret;
 }
Signature · 1 line
1.7.9.5