Commit 40359a9b authored by Tomi Valkeinen's avatar Tomi Valkeinen

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent ab7bf423
...@@ -551,7 +551,8 @@ static int dpi_init_regulator(void) ...@@ -551,7 +551,8 @@ static int dpi_init_regulator(void)
vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "vdds_dsi"); vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "vdds_dsi");
if (IS_ERR(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); return PTR_ERR(vdds_dsi);
} }
......
...@@ -1158,7 +1158,8 @@ static int dsi_regulator_init(struct platform_device *dsidev) ...@@ -1158,7 +1158,8 @@ static int dsi_regulator_init(struct platform_device *dsidev)
vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "VCXIO"); vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "VCXIO");
if (IS_ERR(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); return PTR_ERR(vdds_dsi);
} }
......
...@@ -95,7 +95,8 @@ static int hdmi_init_regulator(void) ...@@ -95,7 +95,8 @@ static int hdmi_init_regulator(void)
reg = devm_regulator_get(&hdmi.pdev->dev, "VDAC"); reg = devm_regulator_get(&hdmi.pdev->dev, "VDAC");
if (IS_ERR(reg)) { 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); return PTR_ERR(reg);
} }
......
...@@ -265,7 +265,8 @@ static int sdi_init_regulator(void) ...@@ -265,7 +265,8 @@ static int sdi_init_regulator(void)
vdds_sdi = devm_regulator_get(&sdi.pdev->dev, "vdds_sdi"); vdds_sdi = devm_regulator_get(&sdi.pdev->dev, "vdds_sdi");
if (IS_ERR(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); return PTR_ERR(vdds_sdi);
} }
......
...@@ -639,7 +639,8 @@ static int venc_init_regulator(void) ...@@ -639,7 +639,8 @@ static int venc_init_regulator(void)
vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda_dac"); vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda_dac");
if (IS_ERR(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); return PTR_ERR(vdda_dac);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment