video: Convert to devm_ioremap_resource()

[deliverable/linux.git] / drivers / video / omap2 / dss / hdmi.c

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 769d0828581ccfec1f350b49b8d1d791732e9b04..72923645dcceddbaf303fdf601f165c6302cf346 100644 (file)
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1080,11 +1080,9 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
        }
 
        /* Base address taken from platform */
-       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;
-       }
+       hdmi.ip_data.base_wp = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(hdmi.ip_data.base_wp))
+               return PTR_ERR(hdmi.ip_data.base_wp);
 
        r = hdmi_get_clocks(pdev);
        if (r) {