1 files changed, 6 insertions, 11 deletions

diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 77c2b5a32b5d..4a6b5eeef6a7 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -748,19 +748,19 @@ static int omap_dsshw_probe(struct platform_device *pdev)
         dss_mem = platform_get_resource(dss.pdev, IORESOURCE_MEM, 0);
         if (!dss_mem) {
                 DSSERR("can't get IORESOURCE_MEM DSS\n");
-                r = -EINVAL;
-                goto err_ioremap;
+                return -EINVAL;
         }
-        dss.base = ioremap(dss_mem->start, resource_size(dss_mem));
+
+        dss.base = devm_ioremap(&pdev->dev, dss_mem->start,
+                                resource_size(dss_mem));
         if (!dss.base) {
                 DSSERR("can't ioremap DSS\n");
-                r = -ENOMEM;
-                goto err_ioremap;
+                return -ENOMEM;
         }
 
         r = dss_get_clocks();
         if (r)
-                goto err_clocks;
+                return r;
 
         pm_runtime_enable(&pdev->dev);
 
@@ -808,9 +808,6 @@ err_dpi:
 err_runtime_get:
         pm_runtime_disable(&pdev->dev);
         dss_put_clocks();
-err_clocks:
-        iounmap(dss.base);
-err_ioremap:
         return r;
 }
 
@@ -819,8 +816,6 @@ static int omap_dsshw_remove(struct platform_device *pdev)
         dpi_exit();
         sdi_exit();
 
-        iounmap(dss.base);
-
         pm_runtime_disable(&pdev->dev);
 
         dss_put_clocks();