summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/pxa3xx-gcu.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-04-08 13:53:10 +0900
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-04-30 14:02:15 +0300
commit9b22b8c52f9b389a9349d6c9111e5ef806a0d728 (patch)
treef0a69a236ba93edacd2e19a5f0498a275a8506dc /drivers/video/fbdev/pxa3xx-gcu.c
parenta513ad2d6de2dbf28465e4eae7d355a926944871 (diff)
video: pxa3xx-gcu: use devm_ioremap_resource()
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>
Diffstat (limited to 'drivers/video/fbdev/pxa3xx-gcu.c')
-rw-r--r--drivers/video/fbdev/pxa3xx-gcu.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c
index 417f9a27eb7d..4df3657fe221 100644
--- a/drivers/video/fbdev/pxa3xx-gcu.c
+++ b/drivers/video/fbdev/pxa3xx-gcu.c
@@ -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);