video: xilinxfb: replace devm_request_and_ioremap by devm_ioremap_resource

Use devm_ioremap_resource instead of devm_request_and_ioremap.

This was done using the semantic patch
scripts/coccinelle/api/devm_ioremap_resource.cocci

The initialization of drvdata->regs_phys was manually moved lower, to take
advantage of the NULL test on res performed by devm_ioremap_resource.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index f3d4a69e1e4e9058c4c4cc605705f1d62d923a48..236fd42370dbb3dafeb61bde7ad57e30881c363d 100644 (file)
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -259,12 +259,12 @@ static int xilinxfb_assign(struct platform_device *pdev,
                struct resource *res;
 
                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;
                }
+               drvdata->regs_phys = res->start;
        }
 
        /* Allocate the framebuffer memory */