OMAPDSS: HDMI: Convert to devm_request_and_ioremap

Using devm_request_and_ioremap provides better memory handling and
improves readability.

Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 72ab260cfb27ce659b34645941f4ffb46ef776a9..1d04bc0479e74c98ee7b59a760621eb15df86dab 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1064,7 +1064,7 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
        }
 
        /* Base address taken from platform */
-       hdmi.ip_data.base_wp = ioremap(res->start, resource_size(res));
+       hdmi.ip_data.base_wp = devm_request_and_ioremap(&pdev->dev, res);
        if (!hdmi.ip_data.base_wp) {
                DSSERR("can't ioremap WP\n");
                return -ENOMEM;
@@ -1072,7 +1072,7 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
 
        r = hdmi_get_clocks(pdev);
        if (r) {
-               iounmap(hdmi.ip_data.base_wp);
+               DSSERR("can't get clocks\n");
                return r;
        }
 
@@ -1117,8 +1117,6 @@ static int __exit omapdss_hdmihw_remove(struct platform_device *pdev)
 
        hdmi_put_clocks();
 
-       iounmap(hdmi.ip_data.base_wp);
-
        return 0;
 }