OMAPDSS: HDMI: fix devm_ioremap_resource error checks

devm_ioremap_resource returns ERR_PTR on error, not NULL. Fix the
error checks in the driver.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/omap2/dss/hdmi4_core.c b/drivers/video/fbdev/omap2/dss/hdmi4_core.c
index 2678d6f06216eafd873ef1181e2d54c8c0d00513..8bde7b7e95ff181ea2792f94f33a7a69442a3449 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi4_core.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi4_core.c
@@ -1009,9 +1009,9 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
        }
 
        core->base = devm_ioremap_resource(&pdev->dev, res);
-       if (!core->base) {
+       if (IS_ERR(core->base)) {
                DSSERR("can't ioremap CORE\n");
-               return -ENOMEM;
+               return PTR_ERR(core->base);
        }
 
        return 0;

diff --git a/drivers/video/fbdev/omap2/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/dss/hdmi5_core.c
index e390dd38a2fa5c7418636ddfb27b258ec2e95785..7528c7a42aa577b9cb4717da528706f8e144347c 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi5_core.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi5_core.c
@@ -913,9 +913,9 @@ int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
        }
 
        core->base = devm_ioremap_resource(&pdev->dev, res);
-       if (!core->base) {
+       if (IS_ERR(core->base)) {
                DSSERR("can't ioremap HDMI core\n");
-               return -ENOMEM;
+               return PTR_ERR(core->base);
        }
 
        return 0;

diff --git a/drivers/video/fbdev/omap2/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/dss/hdmi_phy.c
index 3970574c25a6c4b15eaaaba61ed34c712d600590..e007ac892d79aec1f790688bf7fda9b38875194a 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi_phy.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_phy.c
@@ -246,9 +246,9 @@ int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy)
        }
 
        phy->base = devm_ioremap_resource(&pdev->dev, res);
-       if (!phy->base) {
+       if (IS_ERR(phy->base)) {
                DSSERR("can't ioremap TX PHY\n");
-               return -ENOMEM;
+               return PTR_ERR(phy->base);
        }
 
        return 0;

diff --git a/drivers/video/fbdev/omap2/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
index 6b78d4fb6f59a3f352bfafbc72d453897f3a97cf..54df12a8d744a1b12dc11de98dbf227294ef128c 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
@@ -282,9 +282,9 @@ int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll)
        }
 
        pll->base = devm_ioremap_resource(&pdev->dev, res);
-       if (!pll->base) {
+       if (IS_ERR(pll->base)) {
                DSSERR("can't ioremap PLLCTRL\n");
-               return -ENOMEM;
+               return PTR_ERR(pll->base);
        }
 
        return 0;

diff --git a/drivers/video/fbdev/omap2/dss/hdmi_wp.c b/drivers/video/fbdev/omap2/dss/hdmi_wp.c
index 706ea90c376fe19320fb88f69d0b2ae8ed4ef535..496327e2b21b877b4448e90fe47478f772d41871 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/hdmi_wp.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_wp.c
@@ -249,9 +249,9 @@ int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp)
        }
 
        wp->base = devm_ioremap_resource(&pdev->dev, res);
-       if (!wp->base) {
+       if (IS_ERR(wp->base)) {
                DSSERR("can't ioremap HDMI WP\n");
-               return -ENOMEM;
+               return PTR_ERR(wp->base);
        }
 
        return 0;