Skip to contentSkip to conversation

video: xilinxfb: use devm_ioremap_resource() instead of devm_request_and_ioremap()

PATCH In review Jingoo Han 3 participants 3 messages Sep 2, 2013

Subsystems (2)
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/1 video: xilinxfb: 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/video/xilinxfb.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/xilinxfb.c +3 -3
index 6629b29..ed90051 100644
@@ -260,9 +260,9 @@ static int xilinxfb_assign(struct platform_device *pdev,
 
 		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 		drvdata->regs_phys = res->start;
-		drvdata->regs = devm_request_and_ioremap(&pdev->dev, res);
-		if (!drvdata->regs) {
-			rc = -EADDRNOTAVAIL;
+		drvdata->regs = devm_ioremap_resource(&pdev->dev, res);
+		if (IS_ERR(drvdata->regs)) {
+			rc = PTR_ERR(drvdata->regs);
 			goto err_region;
 		}
 	}
Signature · 1 line
1.7.10.4
Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · Jingoo Han

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

---
 drivers/video/xilinxfb.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/xilinxfb.c +0 -0
index 6629b29..ed90051 100644
@@ -260,9 +260,9 @@ static int xilinxfb_assign(struct platform_device *pdev,
 
 		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

drivers/video/xilinxfb.c static int xilinxfb_assign(struct platform_device *pdev, · line 268

Quoted 10 lines
drivers/video/xilinxfb.c +3 -3
 		drvdata->regs_phys = res->start;
-		drvdata->regs = devm_request_and_ioremap(&pdev->dev, res);
-		if (!drvdata->regs) {
-			rc = -EADDRNOTAVAIL;
+		drvdata->regs = devm_ioremap_resource(&pdev->dev, res);
+		if (IS_ERR(drvdata->regs)) {
+			rc = PTR_ERR(drvdata->regs);
 			goto err_region;
 		}
 	}

Thanks,
Michal

#2 lore raw
In reply to Jingoo Han

Hi,

Quoted 15 lines · Jingoo Han

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

---
 drivers/video/xilinxfb.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/xilinxfb.c +0 -0
index 6629b29..ed90051 100644
@@ -260,9 +260,9 @@ static int xilinxfb_assign(struct platform_device *pdev,
 
 		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

drivers/video/xilinxfb.c static int xilinxfb_assign(struct platform_device *pdev, · line 268

Quoted 10 lines
drivers/video/xilinxfb.c +3 -3
 		drvdata->regs_phys = res->start;
-		drvdata->regs = devm_request_and_ioremap(&pdev->dev, res);
-		if (!drvdata->regs) {
-			rc = -EADDRNOTAVAIL;
+		drvdata->regs = devm_ioremap_resource(&pdev->dev, res);
+		if (IS_ERR(drvdata->regs)) {
+			rc = PTR_ERR(drvdata->regs);
 			goto err_region;
 		}
 	}

I have already applied a similar patch from Julia Lawall.

Tomi