diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-12-19 16:15:34 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-01-13 12:19:55 +0200 |
| commit | 40359a9b08cc51362a4dddfa2beb3b59e24e2b53 (patch) | |
| tree | ca4a78abd6d4dc6c012247e665f3c916d6c139a4 /drivers/video | |
| parent | ab7bf423af05542db94021cf9dbf1b0bf86226b1 (diff) | |
| download | linux-stable-40359a9b08cc51362a4dddfa2beb3b59e24e2b53.tar.gz linux-stable-40359a9b08cc51362a4dddfa2beb3b59e24e2b53.tar.bz2 linux-stable-40359a9b08cc51362a4dddfa2beb3b59e24e2b53.zip | |
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/dss/dpi.c | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/hdmi4.c | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/sdi.c | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index bd48cde53561..fcba3c129efb 100644 --- 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 f6f8d93c4be9..a820c37e323e 100644 --- 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 c7fbe4d36041..4a74538f9ea5 100644 --- 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 ccc569ae7cca..156d146a72a6 100644 --- 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 5f88ac47b7fa..2cd7f7e42105 100644 --- 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); } |