Skip to contentSkip to conversation

dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap()

PATCH Applied Jingoo Han 3 participants 6 messages Sep 2, 2013 dmaengine

lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/2 dma: sh: use devm_ioremap_resource() instead of devm_request_and_ioremap()

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

---
 drivers/dma/sh/sudmac.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/dma/sh/sudmac.c +3 -3
index bf85b8e..7c1ffaa 100644
@@ -358,9 +358,9 @@ static int sudmac_probe(struct platform_device *pdev)
 
 	dma_dev = &su_dev->shdma_dev.dma_dev;
 
-	su_dev->chan_reg = devm_request_and_ioremap(&pdev->dev, chan);
-	if (!su_dev->chan_reg)
-		return err;
+	su_dev->chan_reg = devm_ioremap_resource(&pdev->dev, chan);
+	if (IS_ERR(su_dev->chan_reg))
+		return PTR_ERR(su_dev->chan_reg);
 
 	dma_cap_set(DMA_SLAVE, dma_dev->cap_mask);
 
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2] dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

---
 drivers/dma/k3dma.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/dma/k3dma.c +3 -3
index ef7bc85..a2c330f 100644
@@ -673,9 +673,9 @@ static int k3_dma_probe(struct platform_device *op)
 	if (!d)
 		return -ENOMEM;
 
-	d->base = devm_request_and_ioremap(&op->dev, iores);
-	if (!d->base)
-		return -EADDRNOTAVAIL;
+	d->base = devm_ioremap_resource(&op->dev, iores);
+	if (IS_ERR(d->base))
+		return PTR_ERR(d->base);
 
 	of_id = of_match_device(k3_pdma_dt_ids, &op->dev);
 	if (of_id) {
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH 2/2 dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()

In reply to Jingoo Han

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

---
 drivers/dma/k3dma.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/dma/k3dma.c +3 -3
index ef7bc85..a2c330f 100644
@@ -673,9 +673,9 @@ static int k3_dma_probe(struct platform_device *op)
 	if (!d)
 		return -ENOMEM;
 
-	d->base = devm_request_and_ioremap(&op->dev, iores);
-	if (!d->base)
-		return -EADDRNOTAVAIL;
+	d->base = devm_ioremap_resource(&op->dev, iores);
+	if (IS_ERR(d->base))
+		return PTR_ERR(d->base);
 
 	of_id = of_match_device(k3_pdma_dt_ids, &op->dev);
 	if (of_id) {
Signature · 1 line
1.7.10.4
Acked-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()

Quoted 4 lines · Jingoo Han

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

Thanks Jingoo for point out.

Quoted 22 lines
---
  drivers/dma/k3dma.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
drivers/dma/k3dma.c +3 -3
index ef7bc85..a2c330f 100644
@@ -673,9 +673,9 @@ static int k3_dma_probe(struct platform_device *op)
  	if (!d)
  		return -ENOMEM;
 
-	d->base = devm_request_and_ioremap(&op->dev, iores);
-	if (!d->base)
-		return -EADDRNOTAVAIL;
+	d->base = devm_ioremap_resource(&op->dev, iores);
+	if (IS_ERR(d->base))
+		return PTR_ERR(d->base);
 
  	of_id = of_match_device(k3_pdma_dt_ids, &op->dev);
  	if (of_id) {
Applied
#4 lore raw
In reply to Jingoo Han
Quoted 2 lines · Jingoo Han

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

Applied both, Thanks

~Vinod

#5 lore raw
Quoted 4 lines · Vinod Koul
Quoted 2 lines · Jingoo Han

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

Applied both, Thanks

I have removed this one and reapplied patch 2. This was duplicate of Julia's patch which was sent earlier, so I have applied that one

~Vinod