Commit 6cb7d1b3 authored by Yang Yingliang's avatar Yang Yingliang Committed by Hans Verkuil
Browse files

media: Switch to use dev_err_probe() helper 



In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER.

Reviewed-by: default avatarSean Young <sean@mess.org>
Reviewed-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 96c1212a

drivers/media/cec/platform/stm32/stm32-cec.c

+3 −6
Original line number Diff line number Diff line
@@ -288,12 +288,9 @@ static int stm32_cec_probe(struct platform_device *pdev) 
		return ret;



	cec->clk_cec = devm_clk_get(&pdev->dev, "cec");

	if (IS_ERR(cec->clk_cec)) {

		if (PTR_ERR(cec->clk_cec) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Cannot get cec clock\n");



		return PTR_ERR(cec->clk_cec);

	}

	if (IS_ERR(cec->clk_cec))

		return dev_err_probe(&pdev->dev, PTR_ERR(cec->clk_cec),

				     "Cannot get cec clock\n");



	ret = clk_prepare(cec->clk_cec);

	if (ret) {

drivers/media/i2c/ad5820.c

+6 −12
Original line number Diff line number Diff line
@@ -300,21 +300,15 @@ static int ad5820_probe(struct i2c_client *client) 
		return -ENOMEM;



	coil->vana = devm_regulator_get(&client->dev, "VANA");

	if (IS_ERR(coil->vana)) {

		ret = PTR_ERR(coil->vana);

		if (ret != -EPROBE_DEFER)

			dev_err(&client->dev, "could not get regulator for vana\n");

		return ret;

	}

	if (IS_ERR(coil->vana))

		return dev_err_probe(&client->dev, PTR_ERR(coil->vana),

				     "could not get regulator for vana\n");



	coil->enable_gpio = devm_gpiod_get_optional(&client->dev, "enable",

						    GPIOD_OUT_LOW);

	if (IS_ERR(coil->enable_gpio)) {

		ret = PTR_ERR(coil->enable_gpio);

		if (ret != -EPROBE_DEFER)

			dev_err(&client->dev, "could not get enable gpio\n");

		return ret;

	}

	if (IS_ERR(coil->enable_gpio))

		return dev_err_probe(&client->dev, PTR_ERR(coil->enable_gpio),

				     "could not get enable gpio\n");



	mutex_init(&coil->power_lock);

drivers/media/i2c/imx274.c

+2 −3
Original line number Diff line number Diff line
@@ -2060,9 +2060,8 @@ static int imx274_probe(struct i2c_client *client) 
	imx274->reset_gpio = devm_gpiod_get_optional(dev, "reset",

						     GPIOD_OUT_HIGH);

	if (IS_ERR(imx274->reset_gpio)) {

		if (PTR_ERR(imx274->reset_gpio) != -EPROBE_DEFER)

			dev_err(dev, "Reset GPIO not setup in DT");

		ret = PTR_ERR(imx274->reset_gpio);

		ret = dev_err_probe(dev, PTR_ERR(imx274->reset_gpio),

				    "Reset GPIO not setup in DT\n");

		goto err_me;

	}

drivers/media/i2c/tc358743.c

+3 −6
Original line number Diff line number Diff line
@@ -1891,12 +1891,9 @@ static int tc358743_probe_of(struct tc358743_state *state) 
	int ret;



	refclk = devm_clk_get(dev, "refclk");

	if (IS_ERR(refclk)) {

		if (PTR_ERR(refclk) != -EPROBE_DEFER)

			dev_err(dev, "failed to get refclk: %ld\n",

				PTR_ERR(refclk));

		return PTR_ERR(refclk);

	}

	if (IS_ERR(refclk))

		return dev_err_probe(dev, PTR_ERR(refclk),

				     "failed to get refclk\n");



	ep = of_graph_get_next_endpoint(dev->of_node, NULL);

	if (!ep) {

drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c

+2 −3
Original line number Diff line number Diff line
@@ -52,9 +52,8 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node, 
	for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {

		comp->clk[i] = of_clk_get(node, i);

		if (IS_ERR(comp->clk[i])) {

			if (PTR_ERR(comp->clk[i]) != -EPROBE_DEFER)

				dev_err(dev, "Failed to get clock\n");

			ret = PTR_ERR(comp->clk[i]);

			ret = dev_err_probe(dev, PTR_ERR(comp->clk[i]),

					    "Failed to get clock\n");

			goto put_dev;

		}