OMAPDSS: don't print errors on -EPROBE_DEFER

Nowadays it's normal to get -EPROBE_DEFER from, e.g., regulator_get. As
-EPROBE_DEFER is not really an error, and the driver will be probed fine
a bit later, printing an error message will just confuse the user.

This patch changes omapdss to print an error for regulator_gets only if
the error code is something else than -EPROBE_DEFER.

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

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index bd48cde5356125e49e7d56b4a9109f4195496303..fcba3c129efb4b38fa0c3af95577e7a0adcc269e 100644 (file)
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -551,7 +551,8 @@ static int dpi_init_regulator(void)
 
        vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "vdds_dsi");
        if (IS_ERR(vdds_dsi)) {
-               DSSERR("can't get VDDS_DSI regulator\n");
+               if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
+                       DSSERR("can't get VDDS_DSI regulator\n");
                return PTR_ERR(vdds_dsi);
        }
 

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index f6f8d93c4be941c8c192dfe8ca4aa7ecf3180dda..a820c37e323ed66d90f6cee54259cc4fd53c7fd6 100644 (file)
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1158,7 +1158,8 @@ static int dsi_regulator_init(struct platform_device *dsidev)
                vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "VCXIO");
 
        if (IS_ERR(vdds_dsi)) {
-               DSSERR("can't get VDDS_DSI regulator\n");
+               if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
+                       DSSERR("can't get VDDS_DSI regulator\n");
                return PTR_ERR(vdds_dsi);
        }
 

diff --git a/drivers/video/omap2/dss/hdmi4.c b/drivers/video/omap2/dss/hdmi4.c
index c7fbe4d36041c9534e6de12a4094aee2c80f48f2..4a74538f9ea5ea87b8a0f49149700662c103c01a 100644 (file)
--- a/drivers/video/omap2/dss/hdmi4.c
+++ b/drivers/video/omap2/dss/hdmi4.c
@@ -95,7 +95,8 @@ static int hdmi_init_regulator(void)
                reg = devm_regulator_get(&hdmi.pdev->dev, "VDAC");
 
        if (IS_ERR(reg)) {
-               DSSERR("can't get VDDA_HDMI_DAC regulator\n");
+               if (PTR_ERR(reg) != -EPROBE_DEFER)
+                       DSSERR("can't get VDDA_HDMI_DAC regulator\n");
                return PTR_ERR(reg);
        }
 

diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index ccc569ae7ccaddf970436ba9f6645978f9b57118..156d146a72a66207f1b825492fdae52112780272 100644 (file)
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -265,7 +265,8 @@ static int sdi_init_regulator(void)
 
        vdds_sdi = devm_regulator_get(&sdi.pdev->dev, "vdds_sdi");
        if (IS_ERR(vdds_sdi)) {
-               DSSERR("can't get VDDS_SDI regulator\n");
+               if (PTR_ERR(vdds_sdi) != -EPROBE_DEFER)
+                       DSSERR("can't get VDDS_SDI regulator\n");
                return PTR_ERR(vdds_sdi);
        }
 

diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 5f88ac47b7fa73d56e9e87afd171fb28fc6b81ba..2cd7f7e42105a727b5213bde9950e32fcb7ca7b7 100644 (file)
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -639,7 +639,8 @@ static int venc_init_regulator(void)
        vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda_dac");
 
        if (IS_ERR(vdda_dac)) {
-               DSSERR("can't get VDDA_DAC regulator\n");
+               if (PTR_ERR(vdda_dac) != -EPROBE_DEFER)
+                       DSSERR("can't get VDDA_DAC regulator\n");
                return PTR_ERR(vdda_dac);
        }