drm: omapdrm: Remove duplicate error messages when mapping memory

The devm_ioremap_resource() call can handle being given a NULL resource,
and prints an error message when mapping fails. Switch the remaining
devm_ioremap() calls to devm_ioremap_resource() and remove all
extraneous resource NULL checks and error messages printed manually by
the driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index 5ac0145fbae67d0cecc4b8e04107c0c963d3ce7f..4d5b77f9797c807f7d1ce5f0db68ea26ed13f8c5 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -4405,17 +4405,9 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
                return r;
 
        dispc_mem = platform_get_resource(dispc.pdev, IORESOURCE_MEM, 0);
-       if (!dispc_mem) {
-               DSSERR("can't get IORESOURCE_MEM DISPC\n");
-               return -EINVAL;
-       }
-
-       dispc.base = devm_ioremap(&pdev->dev, dispc_mem->start,
-                                 resource_size(dispc_mem));
-       if (!dispc.base) {
-               DSSERR("can't ioremap DISPC\n");
-               return -ENOMEM;
-       }
+       dispc.base = devm_ioremap_resource(&pdev->dev, dispc_mem);
+       if (IS_ERR(dispc.base))
+               return PTR_ERR(dispc.base);
 
        dispc.irq = platform_get_irq(dispc.pdev, 0);
        if (dispc.irq < 0) {

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 910754bf8cf9e73a9cf0d0ecaf164b837eeeb12f..0b4f5bce4d13175d0f4ab17db43040cced04d4af 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -5326,12 +5326,9 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
 
        dsi_mem = res;
 
-       dsi->proto_base = devm_ioremap(&dsidev->dev, res->start,
-               resource_size(res));
-       if (!dsi->proto_base) {
-               DSSERR("can't ioremap DSI protocol engine\n");
-               return -ENOMEM;
-       }
+       dsi->proto_base = devm_ioremap_resource(&dsidev->dev, res);
+       if (IS_ERR(dsi->proto_base))
+               return PTR_ERR(dsi->proto_base);
 
        res = platform_get_resource_byname(dsidev, IORESOURCE_MEM, "phy");
        if (!res) {
@@ -5346,12 +5343,9 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
                res = &temp_res;
        }
 
-       dsi->phy_base = devm_ioremap(&dsidev->dev, res->start,
-               resource_size(res));
-       if (!dsi->phy_base) {
-               DSSERR("can't ioremap DSI PHY\n");
-               return -ENOMEM;
-       }
+       dsi->phy_base = devm_ioremap_resource(&dsidev->dev, res);
+       if (IS_ERR(dsi->phy_base))
+               return PTR_ERR(dsi->phy_base);
 
        res = platform_get_resource_byname(dsidev, IORESOURCE_MEM, "pll");
        if (!res) {
@@ -5366,12 +5360,9 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)
                res = &temp_res;
        }
 
-       dsi->pll_base = devm_ioremap(&dsidev->dev, res->start,
-               resource_size(res));
-       if (!dsi->pll_base) {
-               DSSERR("can't ioremap DSI PLL\n");
-               return -ENOMEM;
-       }
+       dsi->pll_base = devm_ioremap_resource(&dsidev->dev, res);
+       if (IS_ERR(dsi->pll_base))
+               return PTR_ERR(dsi->pll_base);
 
        dsi->irq = platform_get_irq(dsi->pdev, 0);
        if (dsi->irq < 0) {

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index fa99ec72d832aea75238098a2a75ca7563fe4368..99e22ca972c7c3e973a021a19e1aa3352084b751 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1158,17 +1158,9 @@ static int dss_bind(struct device *dev)
                return r;
 
        dss_mem = platform_get_resource(dss.pdev, IORESOURCE_MEM, 0);
-       if (!dss_mem) {
-               DSSERR("can't get IORESOURCE_MEM DSS\n");
-               return -EINVAL;
-       }
-
-       dss.base = devm_ioremap(&pdev->dev, dss_mem->start,
-                               resource_size(dss_mem));
-       if (!dss.base) {
-               DSSERR("can't ioremap DSS\n");
-               return -ENOMEM;
-       }
+       dss.base = devm_ioremap_resource(&pdev->dev, dss_mem);
+       if (IS_ERR(dss.base))
+               return PTR_ERR(dss.base);
 
        r = dss_get_clocks();
        if (r)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
index e05b7ac4f7dd060bf983b406a47673f63b09b203..ed60016134055375cbaabe67d0061d7e437cd30e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
@@ -889,16 +889,9 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
        struct resource *res;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
-       if (!res) {
-               DSSERR("can't get CORE mem resource\n");
-               return -EINVAL;
-       }
-
        core->base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(core->base)) {
-               DSSERR("can't ioremap CORE\n");
+       if (IS_ERR(core->base))
                return PTR_ERR(core->base);
-       }
 
        return 0;
 }

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
index 8de1d7b2ae5554137f539b3ba21ed09b153af32f..ab179ec133c0b275fecdb816270884d8551e4694 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
@@ -910,16 +910,9 @@ int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
        struct resource *res;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
-       if (!res) {
-               DSSERR("can't get CORE IORESOURCE_MEM HDMI\n");
-               return -EINVAL;
-       }
-
        core->base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(core->base)) {
-               DSSERR("can't ioremap HDMI core\n");
+       if (IS_ERR(core->base))
                return PTR_ERR(core->base);
-       }
 
        return 0;
 }

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
index 3ead47cccac57399db94b61223d712755c76258a..fb5e4c724b4b7bfe8c953af4abcff3dba098cd47 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
@@ -233,16 +233,9 @@ int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy)
                return r;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
-       if (!res) {
-               DSSERR("can't get PHY mem resource\n");
-               return -EINVAL;
-       }
-
        phy->base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(phy->base)) {
-               DSSERR("can't ioremap TX PHY\n");
+       if (IS_ERR(phy->base))
                return PTR_ERR(phy->base);
-       }
 
        return 0;
 }

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
index b8bf6a9e555721c40517a7324aacc00aeba53c5a..46239358655a3287eb15610e4fc47127c61b89f9 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
@@ -180,16 +180,9 @@ int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll,
        pll->wp = wp;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");
-       if (!res) {
-               DSSERR("can't get PLL mem resource\n");
-               return -EINVAL;
-       }
-
        pll->base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(pll->base)) {
-               DSSERR("can't ioremap PLLCTRL\n");
+       if (IS_ERR(pll->base))
                return PTR_ERR(pll->base);
-       }
 
        r = dsi_init_pll_data(pdev, pll);
        if (r) {

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
index 597ec9d87d1dd834e6cfe22686a66974d7daad2a..ab129df2e310568c744ca34acd5c7cb2886183da 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
@@ -287,17 +287,11 @@ int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp)
        struct resource *res;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wp");
-       if (!res) {
-               DSSERR("can't get WP mem resource\n");
-               return -EINVAL;
-       }
-       wp->phys_base = res->start;
-
        wp->base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(wp->base)) {
-               DSSERR("can't ioremap HDMI WP\n");
+       if (IS_ERR(wp->base))
                return PTR_ERR(wp->base);
-       }
+
+       wp->phys_base = res->start;
 
        return 0;
 }

diff --git a/drivers/gpu/drm/omapdrm/dss/rfbi.c b/drivers/gpu/drm/omapdrm/dss/rfbi.c
index 09724757366a8985bd630c8599a62280c786f0eb..bf6b96877daf3d9b6ec94a31871e7529d1ed3c1f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/rfbi.c
+++ b/drivers/gpu/drm/omapdrm/dss/rfbi.c
@@ -965,17 +965,9 @@ static int rfbi_bind(struct device *dev, struct device *master, void *data)
        sema_init(&rfbi.bus_lock, 1);
 
        rfbi_mem = platform_get_resource(rfbi.pdev, IORESOURCE_MEM, 0);
-       if (!rfbi_mem) {
-               DSSERR("can't get IORESOURCE_MEM RFBI\n");
-               return -EINVAL;
-       }
-
-       rfbi.base = devm_ioremap(&pdev->dev, rfbi_mem->start,
-                                resource_size(rfbi_mem));
-       if (!rfbi.base) {
-               DSSERR("can't ioremap RFBI\n");
-               return -ENOMEM;
-       }
+       rfbi.base = devm_ioremap_resource(&pdev->dev, rfbi_mem);
+       if (IS_ERR(rfbi.base))
+               return PTR_ERR(rfbi.base);
 
        clk = clk_get(&pdev->dev, "ick");
        if (IS_ERR(clk)) {

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 19d14957f566b7d41d6e917408f4f0f902042e89..fbdc838586f941a14d81f74b05822b14d3de7859 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -869,17 +869,9 @@ static int venc_bind(struct device *dev, struct device *master, void *data)
        venc.wss_data = 0;
 
        venc_mem = platform_get_resource(venc.pdev, IORESOURCE_MEM, 0);
-       if (!venc_mem) {
-               DSSERR("can't get IORESOURCE_MEM VENC\n");
-               return -EINVAL;
-       }
-
-       venc.base = devm_ioremap(&pdev->dev, venc_mem->start,
-                                resource_size(venc_mem));
-       if (!venc.base) {
-               DSSERR("can't ioremap VENC\n");
-               return -ENOMEM;
-       }
+       venc.base = devm_ioremap_resource(&pdev->dev, venc_mem);
+       if (IS_ERR(venc.base))
+               return PTR_ERR(venc.base);
 
        r = venc_get_clocks(pdev);
        if (r)

diff --git a/drivers/gpu/drm/omapdrm/dss/video-pll.c b/drivers/gpu/drm/omapdrm/dss/video-pll.c
index 7429de928d4e59e5f5e85a7190465468d76c557b..fbd1263a29a4a474e6ec5096b9410a12238f17ee 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/video-pll.c
+++ b/drivers/gpu/drm/omapdrm/dss/video-pll.c
@@ -150,33 +150,17 @@ struct dss_pll *dss_video_pll_init(struct platform_device *pdev, int id,
        /* PLL CONTROL */
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, reg_name[id]);
-       if (!res) {
-               dev_err(&pdev->dev,
-                       "missing platform resource data for pll%d\n", id);
-               return ERR_PTR(-ENODEV);
-       }
-
        pll_base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(pll_base)) {
-               dev_err(&pdev->dev, "failed to ioremap pll%d reg_name\n", id);
+       if (IS_ERR(pll_base))
                return ERR_CAST(pll_base);
-       }
 
        /* CLOCK CONTROL */
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
                clkctrl_name[id]);
-       if (!res) {
-               dev_err(&pdev->dev,
-                       "missing platform resource data for pll%d\n", id);
-               return ERR_PTR(-ENODEV);
-       }
-
        clkctrl_base = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(clkctrl_base)) {
-               dev_err(&pdev->dev, "failed to ioremap pll%d clkctrl\n", id);
+       if (IS_ERR(clkctrl_base))
                return ERR_CAST(clkctrl_base);
-       }
 
        /* CLKIN */