OSDN Git Service

video: pxa3xx-gcu: use devm_ioremap_resource()
authorJingoo Han <jg1.han@samsung.com>
Tue, 8 Apr 2014 04:53:10 +0000 (13:53 +0900)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 30 Apr 2014 11:02:15 +0000 (14:02 +0300)
Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Daniel Mack <zonque@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/fbdev/pxa3xx-gcu.c

index 417f9a2..4df3657 100644 (file)
@@ -612,11 +612,9 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev)
 
        /* handle IO resources */
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       priv->mmio_base = devm_request_and_ioremap(dev, r);
-       if (IS_ERR(priv->mmio_base)) {
-               dev_err(dev, "failed to map I/O memory\n");
+       priv->mmio_base = devm_ioremap_resource(dev, r);
+       if (IS_ERR(priv->mmio_base))
                return PTR_ERR(priv->mmio_base);
-       }
 
        /* enable the clock */
        priv->clk = devm_clk_get(dev, NULL);