Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40359a9b authored Dec 19, 2013 by 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: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent ab7bf423

drivers/video/omap2/dss/dpi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -551,6 +551,7 @@ static int dpi_init_regulator(void)

		vdds_dsi = devm_regulator_get(&dpi.pdev->dev, "vdds_dsi");
		if (IS_ERR(vdds_dsi)) {
		if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
		DSSERR("can't get VDDS_DSI regulator\n");
		return PTR_ERR(vdds_dsi);
		}

drivers/video/omap2/dss/dsi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1158,6 +1158,7 @@ static int dsi_regulator_init(struct platform_device *dsidev)
		vdds_dsi = devm_regulator_get(&dsi->pdev->dev, "VCXIO");

		if (IS_ERR(vdds_dsi)) {
		if (PTR_ERR(vdds_dsi) != -EPROBE_DEFER)
		DSSERR("can't get VDDS_DSI regulator\n");
		return PTR_ERR(vdds_dsi);
		}

drivers/video/omap2/dss/hdmi4.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ static int hdmi_init_regulator(void)
		reg = devm_regulator_get(&hdmi.pdev->dev, "VDAC");

		if (IS_ERR(reg)) {
		if (PTR_ERR(reg) != -EPROBE_DEFER)
		DSSERR("can't get VDDA_HDMI_DAC regulator\n");
		return PTR_ERR(reg);
		}

drivers/video/omap2/dss/sdi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ static int sdi_init_regulator(void)

		vdds_sdi = devm_regulator_get(&sdi.pdev->dev, "vdds_sdi");
		if (IS_ERR(vdds_sdi)) {
		if (PTR_ERR(vdds_sdi) != -EPROBE_DEFER)
		DSSERR("can't get VDDS_SDI regulator\n");
		return PTR_ERR(vdds_sdi);
		}

drivers/video/omap2/dss/venc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -639,6 +639,7 @@ static int venc_init_regulator(void)
		vdda_dac = devm_regulator_get(&venc.pdev->dev, "vdda_dac");

		if (IS_ERR(vdda_dac)) {
		if (PTR_ERR(vdda_dac) != -EPROBE_DEFER)
		DSSERR("can't get VDDA_DAC regulator\n");
		return PTR_ERR(vdda_dac);
		}