[PATCH -next 00/13] media: Switch to use dev_err_probe() helper

[PATCH -next 00/13] media: Switch to use dev_err_probe() helper

[Yang Yingliang]

In the probe path, dev_err() can be replace with dev_err_probe()
which will check if error code is -EPROBE_DEFER. It will print
error code in a human readable way and simplify the code.

Yang Yingliang (13):
  media: platform: stm32-cec: Switch to use dev_err_probe() helper
  media: i2c: ad5820: Switch to use dev_err_probe() helper
  media: i2c: imx274: Switch to use dev_err_probe() helper
  media: i2c: tc358743: Switch to use dev_err_probe() helper
  media: platform: mtk_mdp_comp: Switch to use dev_err_probe() helper
  media: platform: exynos4-is: Switch to use dev_err_probe() helper
  media: stm32-dcmi: Switch to use dev_err_probe() helper
  media: omap3isp: Switch to use dev_err_probe() helper
  media: xilinx: csi2rxss: Switch to use dev_err_probe() helper
  media: rc: gpio-ir-recv: Switch to use dev_err_probe() helper
  media: rc: gpio-ir-tx: Switch to use dev_err_probe() helper
  media: rc: ir-rx51: Switch to use dev_err_probe() helper
  media: uvcvideo: Switch to use dev_err_probe() helper

 drivers/media/cec/platform/stm32/stm32-cec.c  |  9 +++----
 drivers/media/i2c/ad5820.c                    | 18 +++++--------
 drivers/media/i2c/imx274.c                    |  5 ++--
 drivers/media/i2c/tc358743.c                  |  9 +++----
 .../platform/mediatek/mdp/mtk_mdp_comp.c      |  5 ++--
 .../platform/samsung/exynos4-is/media-dev.c   |  4 +--
 drivers/media/platform/st/stm32/stm32-dcmi.c  | 27 +++++++------------
 drivers/media/platform/ti/omap3isp/isp.c      |  3 +--
 .../media/platform/xilinx/xilinx-csi2rxss.c   |  8 +++---
 drivers/media/rc/gpio-ir-recv.c               | 10 +++----
 drivers/media/rc/gpio-ir-tx.c                 |  9 +++----
 drivers/media/rc/ir-rx51.c                    |  9 ++-----
 drivers/media/usb/uvc/uvc_driver.c            |  9 +++----
 13 files changed, 41 insertions(+), 84 deletions(-)

-- 
2.25.1

[PATCH -next 01/13] media: platform: stm32-cec: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/cec/platform/stm32/stm32-cec.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/media/cec/platform/stm32/stm32-cec.c b/drivers/media/cec/platform/stm32/stm32-cec.c
index 40db7911b437..7b2db46a5722 100644
--- a/drivers/media/cec/platform/stm32/stm32-cec.c
+++ b/drivers/media/cec/platform/stm32/stm32-cec.c
@@ -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) {
-- 
2.25.1

[PATCH -next 02/13] media: i2c: ad5820: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/i2c/ad5820.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c
index 516de278cc49..6a7f8ef9db05 100644
--- a/drivers/media/i2c/ad5820.c
+++ b/drivers/media/i2c/ad5820.c
@@ -301,21 +301,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);
 
-- 
2.25.1

[PATCH -next 03/13] media: i2c: imx274: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/i2c/imx274.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
index a00761b1e18c..0df515ab2cbf 100644
--- a/drivers/media/i2c/imx274.c
+++ b/drivers/media/i2c/imx274.c
@@ -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");
 		goto err_me;
 	}
 
-- 
2.25.1

[PATCH -next 04/13] media: i2c: tc358743: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/i2c/tc358743.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
index 200841c1f5cf..9197fa0b1bc2 100644
--- a/drivers/media/i2c/tc358743.c
+++ b/drivers/media/i2c/tc358743.c
@@ -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) {
-- 
2.25.1

[PATCH -next 05/13] media: platform: mtk_mdp_comp: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
index 1e3833f1c9ae..ad5fab2d8bfa 100644
--- a/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
+++ b/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
@@ -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;
 		}
 
-- 
2.25.1

[PATCH -next 06/13] media: platform: exynos4-is: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/platform/samsung/exynos4-is/media-dev.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/platform/samsung/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c
index 52b43ea04030..b7977d8da8e5 100644
--- a/drivers/media/platform/samsung/exynos4-is/media-dev.c
+++ b/drivers/media/platform/samsung/exynos4-is/media-dev.c
@@ -1473,9 +1473,7 @@ static int fimc_md_probe(struct platform_device *pdev)
 
 	pinctrl = devm_pinctrl_get(dev);
 	if (IS_ERR(pinctrl)) {
-		ret = PTR_ERR(pinctrl);
-		if (ret != EPROBE_DEFER)
-			dev_err(dev, "Failed to get pinctrl: %d\n", ret);
+		dev_err_probe(dev, PTR_ERR(pinctrl), "Failed to get pinctrl\n");
 		goto err_clk;
 	}
 
-- 
2.25.1

[PATCH -next 07/13] media: stm32-dcmi: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/platform/st/stm32/stm32-dcmi.c | 27 +++++++-------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/drivers/media/platform/st/stm32/stm32-dcmi.c b/drivers/media/platform/st/stm32/stm32-dcmi.c
index 2ca95ab2b0fe..ec138843d090 100644
--- a/drivers/media/platform/st/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/st/stm32/stm32-dcmi.c
@@ -1946,12 +1946,9 @@ static int dcmi_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	dcmi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
-	if (IS_ERR(dcmi->rstc)) {
-		if (PTR_ERR(dcmi->rstc) != -EPROBE_DEFER)
-			dev_err(&pdev->dev, "Could not get reset control\n");
-
-		return PTR_ERR(dcmi->rstc);
-	}
+	if (IS_ERR(dcmi->rstc))
+		return dev_err_probe(&pdev->dev, PTR_ERR(dcmi->rstc),
+				     "Could not get reset control\n");
 
 	/* Get bus characteristics from devicetree */
 	np = of_graph_get_next_endpoint(np, NULL);
@@ -2003,20 +2000,14 @@ static int dcmi_probe(struct platform_device *pdev)
 	}
 
 	mclk = devm_clk_get(&pdev->dev, "mclk");
-	if (IS_ERR(mclk)) {
-		if (PTR_ERR(mclk) != -EPROBE_DEFER)
-			dev_err(&pdev->dev, "Unable to get mclk\n");
-		return PTR_ERR(mclk);
-	}
+	if (IS_ERR(mclk))
+		return dev_err_probe(&pdev->dev, PTR_ERR(mclk),
+				     "Unable to get mclk\n");
 
 	chan = dma_request_chan(&pdev->dev, "tx");
-	if (IS_ERR(chan)) {
-		ret = PTR_ERR(chan);
-		if (ret != -EPROBE_DEFER)
-			dev_err(&pdev->dev,
-				"Failed to request DMA channel: %d\n", ret);
-		return ret;
-	}
+	if (IS_ERR(chan))
+		return dev_err_probe(&pdev->dev, PTR_ERR(chan),
+				     "Failed to request DMA channel\n");
 
 	dcmi->dma_max_burst = UINT_MAX;
 	ret = dma_get_slave_caps(chan, &caps);
-- 
2.25.1

[PATCH -next 08/13] media: omap3isp: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/platform/ti/omap3isp/isp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/platform/ti/omap3isp/isp.c b/drivers/media/platform/ti/omap3isp/isp.c
index a6052df9bb19..5d6867b8f197 100644
--- a/drivers/media/platform/ti/omap3isp/isp.c
+++ b/drivers/media/platform/ti/omap3isp/isp.c
@@ -1886,8 +1886,7 @@ static int isp_initialize_modules(struct isp_device *isp)
 
 	ret = omap3isp_ccp2_init(isp);
 	if (ret < 0) {
-		if (ret != -EPROBE_DEFER)
-			dev_err(isp->dev, "CCP2 initialization failed\n");
+		dev_err_probe(isp->dev, ret, "CCP2 initialization failed\n");
 		goto error_ccp2;
 	}
 
-- 
2.25.1

[PATCH -next 09/13] media: xilinx: csi2rxss: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/platform/xilinx/xilinx-csi2rxss.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/xilinx/xilinx-csi2rxss.c b/drivers/media/platform/xilinx/xilinx-csi2rxss.c
index 29b53febc2e7..080e2483cc92 100644
--- a/drivers/media/platform/xilinx/xilinx-csi2rxss.c
+++ b/drivers/media/platform/xilinx/xilinx-csi2rxss.c
@@ -976,11 +976,9 @@ static int xcsi2rxss_probe(struct platform_device *pdev)
 	/* Reset GPIO */
 	xcsi2rxss->rst_gpio = devm_gpiod_get_optional(dev, "video-reset",
 						      GPIOD_OUT_HIGH);
-	if (IS_ERR(xcsi2rxss->rst_gpio)) {
-		if (PTR_ERR(xcsi2rxss->rst_gpio) != -EPROBE_DEFER)
-			dev_err(dev, "Video Reset GPIO not setup in DT");
-		return PTR_ERR(xcsi2rxss->rst_gpio);
-	}
+	if (IS_ERR(xcsi2rxss->rst_gpio))
+		return dev_err_probe(dev, PTR_ERR(xcsi2rxss->rst_gpio),
+				     "Video Reset GPIO not setup in DT");
 
 	ret = xcsi2rxss_parse_of(xcsi2rxss);
 	if (ret < 0)
-- 
2.25.1

[PATCH -next 10/13] media: rc: gpio-ir-recv: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/rc/gpio-ir-recv.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 22e524b69806..8f1fff7af6c9 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -74,13 +74,9 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	gpio_dev->gpiod = devm_gpiod_get(dev, NULL, GPIOD_IN);
-	if (IS_ERR(gpio_dev->gpiod)) {
-		rc = PTR_ERR(gpio_dev->gpiod);
-		/* Just try again if this happens */
-		if (rc != -EPROBE_DEFER)
-			dev_err(dev, "error getting gpio (%d)\n", rc);
-		return rc;
-	}
+	if (IS_ERR(gpio_dev->gpiod))
+		return dev_err_probe(dev, PTR_ERR(gpio_dev->gpiod),
+				     "error getting gpio\n");
 	gpio_dev->irq = gpiod_to_irq(gpio_dev->gpiod);
 	if (gpio_dev->irq < 0)
 		return gpio_dev->irq;
-- 
2.25.1

[PATCH -next 11/13] media: rc: gpio-ir-tx: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/rc/gpio-ir-tx.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/media/rc/gpio-ir-tx.c b/drivers/media/rc/gpio-ir-tx.c
index d3063ddb472e..2b829c146db1 100644
--- a/drivers/media/rc/gpio-ir-tx.c
+++ b/drivers/media/rc/gpio-ir-tx.c
@@ -174,12 +174,9 @@ static int gpio_ir_tx_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	gpio_ir->gpio = devm_gpiod_get(&pdev->dev, NULL, GPIOD_OUT_LOW);
-	if (IS_ERR(gpio_ir->gpio)) {
-		if (PTR_ERR(gpio_ir->gpio) != -EPROBE_DEFER)
-			dev_err(&pdev->dev, "Failed to get gpio (%ld)\n",
-				PTR_ERR(gpio_ir->gpio));
-		return PTR_ERR(gpio_ir->gpio);
-	}
+	if (IS_ERR(gpio_ir->gpio))
+		return dev_err_probe(&pdev->dev, PTR_ERR(gpio_ir->gpio),
+				     "Failed to get gpio\n");
 
 	rcdev->priv = gpio_ir;
 	rcdev->driver_name = DRIVER_NAME;
-- 
2.25.1

[PATCH -next 12/13] media: rc: ir-rx51: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/rc/ir-rx51.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index a3b145183260..85080c3d2053 100644
--- a/drivers/media/rc/ir-rx51.c
+++ b/drivers/media/rc/ir-rx51.c
@@ -231,13 +231,8 @@ static int ir_rx51_probe(struct platform_device *dev)
 	struct rc_dev *rcdev;
 
 	pwm = pwm_get(&dev->dev, NULL);
-	if (IS_ERR(pwm)) {
-		int err = PTR_ERR(pwm);
-
-		if (err != -EPROBE_DEFER)
-			dev_err(&dev->dev, "pwm_get failed: %d\n", err);
-		return err;
-	}
+	if (IS_ERR(pwm))
+		return dev_err_probe(&dev->dev, PTR_ERR(pwm), "pwm_get failed\n");
 
 	/* Use default, in case userspace does not set the carrier */
 	ir_rx51.freq = DIV_ROUND_CLOSEST_ULL(pwm_get_period(pwm), NSEC_PER_SEC);
-- 
2.25.1

[PATCH -next 13/13] media: uvcvideo: Switch to use dev_err_probe() helper

[Yang Yingliang]

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

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/media/usb/uvc/uvc_driver.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 744051b52e12..94f84c3c4712 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1554,12 +1554,9 @@ static int uvc_gpio_parse(struct uvc_device *dev)
 		return PTR_ERR_OR_ZERO(gpio_privacy);
 
 	irq = gpiod_to_irq(gpio_privacy);
-	if (irq < 0) {
-		if (irq != EPROBE_DEFER)
-			dev_err(&dev->udev->dev,
-				"No IRQ for privacy GPIO (%d)\n", irq);
-		return irq;
-	}
+	if (irq < 0)
+		return dev_err_probe(&dev->udev->dev, irq,
+				     "No IRQ for privacy GPIO\n");
 
 	unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1);
 	if (!unit)
-- 
2.25.1

Re: [PATCH -next 10/13] media: rc: gpio-ir-recv: Switch to use dev_err_probe() helper

[Sean Young]

On Thu, Sep 15, 2022 at 11:03:21PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>  drivers/media/rc/gpio-ir-recv.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
> index 22e524b69806..8f1fff7af6c9 100644
> --- a/drivers/media/rc/gpio-ir-recv.c
> +++ b/drivers/media/rc/gpio-ir-recv.c
> @@ -74,13 +74,9 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  
>  	gpio_dev->gpiod = devm_gpiod_get(dev, NULL, GPIOD_IN);
> -	if (IS_ERR(gpio_dev->gpiod)) {
> -		rc = PTR_ERR(gpio_dev->gpiod);
> -		/* Just try again if this happens */
> -		if (rc != -EPROBE_DEFER)
> -			dev_err(dev, "error getting gpio (%d)\n", rc);
> -		return rc;
> -	}
> +	if (IS_ERR(gpio_dev->gpiod))
> +		return dev_err_probe(dev, PTR_ERR(gpio_dev->gpiod),
> +				     "error getting gpio\n");

Now the error number is no longer logged. That can't be good?


Sean

>  	gpio_dev->irq = gpiod_to_irq(gpio_dev->gpiod);
>  	if (gpio_dev->irq < 0)
>  		return gpio_dev->irq;
> -- 
> 2.25.1

Re: [PATCH -next 10/13] media: rc: gpio-ir-recv: Switch to use dev_err_probe() helper

[Yang Yingliang]

Hi,

On 2022/9/16 0:38, Sean Young wrote:
> On Thu, Sep 15, 2022 at 11:03:21PM +0800, Yang Yingliang wrote:
>> In the probe path, dev_err() can be replace with dev_err_probe()
>> which will check if error code is -EPROBE_DEFER.
>>
>> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
>> ---
>>   drivers/media/rc/gpio-ir-recv.c | 10 +++-------
>>   1 file changed, 3 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
>> index 22e524b69806..8f1fff7af6c9 100644
>> --- a/drivers/media/rc/gpio-ir-recv.c
>> +++ b/drivers/media/rc/gpio-ir-recv.c
>> @@ -74,13 +74,9 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
>>   		return -ENOMEM;
>>   
>>   	gpio_dev->gpiod = devm_gpiod_get(dev, NULL, GPIOD_IN);
>> -	if (IS_ERR(gpio_dev->gpiod)) {
>> -		rc = PTR_ERR(gpio_dev->gpiod);
>> -		/* Just try again if this happens */
>> -		if (rc != -EPROBE_DEFER)
>> -			dev_err(dev, "error getting gpio (%d)\n", rc);
>> -		return rc;
>> -	}
>> +	if (IS_ERR(gpio_dev->gpiod))
>> +		return dev_err_probe(dev, PTR_ERR(gpio_dev->gpiod),
>> +				     "error getting gpio\n");
> Now the error number is no longer logged. That can't be good?
Instead of error number, the error name is printed in dev_err_probe(), 
and  it's better for read.

Thanks,
Yang
>
>
> Sean
>
>>   	gpio_dev->irq = gpiod_to_irq(gpio_dev->gpiod);
>>   	if (gpio_dev->irq < 0)
>>   		return gpio_dev->irq;
>> -- 
>> 2.25.1
> .

Re: [PATCH -next 10/13] media: rc: gpio-ir-recv: Switch to use dev_err_probe() helper

[Sean Young]

Hi,

On Fri, Sep 16, 2022 at 09:13:14AM +0800, Yang Yingliang wrote:
> On 2022/9/16 0:38, Sean Young wrote:
> > On Thu, Sep 15, 2022 at 11:03:21PM +0800, Yang Yingliang wrote:
> > > In the probe path, dev_err() can be replace with dev_err_probe()
> > > which will check if error code is -EPROBE_DEFER.
> > > 
> > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> > > ---
> > >   drivers/media/rc/gpio-ir-recv.c | 10 +++-------
> > >   1 file changed, 3 insertions(+), 7 deletions(-)
> > > 
> > > diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
> > > index 22e524b69806..8f1fff7af6c9 100644
> > > --- a/drivers/media/rc/gpio-ir-recv.c
> > > +++ b/drivers/media/rc/gpio-ir-recv.c
> > > @@ -74,13 +74,9 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
> > >   		return -ENOMEM;
> > >   	gpio_dev->gpiod = devm_gpiod_get(dev, NULL, GPIOD_IN);
> > > -	if (IS_ERR(gpio_dev->gpiod)) {
> > > -		rc = PTR_ERR(gpio_dev->gpiod);
> > > -		/* Just try again if this happens */
> > > -		if (rc != -EPROBE_DEFER)
> > > -			dev_err(dev, "error getting gpio (%d)\n", rc);
> > > -		return rc;
> > > -	}
> > > +	if (IS_ERR(gpio_dev->gpiod))
> > > +		return dev_err_probe(dev, PTR_ERR(gpio_dev->gpiod),
> > > +				     "error getting gpio\n");
> > Now the error number is no longer logged. That can't be good?
> Instead of error number, the error name is printed in dev_err_probe(), and 
> it's better for read.

Yes, I should have checked this. This is much nicer, with the error printed with
%pe. Thanks!

For the three drivers in drivers/media/rc/ :

Reviewed-by: Sean Young <sean@mess.org>

Thanks
Sean

Re: [PATCH -next 13/13] media: uvcvideo: Switch to use dev_err_probe() helper

[Ricardo Ribalda]

On Thu, 15 Sept 2022 at 16:05, Yang Yingliang <yangyingliang@huawei.com> wrote:
>
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
> ---
>  drivers/media/usb/uvc/uvc_driver.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index 744051b52e12..94f84c3c4712 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -1554,12 +1554,9 @@ static int uvc_gpio_parse(struct uvc_device *dev)
>                 return PTR_ERR_OR_ZERO(gpio_privacy);
>
>         irq = gpiod_to_irq(gpio_privacy);
> -       if (irq < 0) {
> -               if (irq != EPROBE_DEFER)
> -                       dev_err(&dev->udev->dev,
> -                               "No IRQ for privacy GPIO (%d)\n", irq);
> -               return irq;
> -       }
> +       if (irq < 0)
> +               return dev_err_probe(&dev->udev->dev, irq,
> +                                    "No IRQ for privacy GPIO\n");
>
>         unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1);
>         if (!unit)
> --
> 2.25.1
>


-- 
Ricardo Ribalda

Re: [PATCH -next 09/13] media: xilinx: csi2rxss: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:20PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/platform/xilinx/xilinx-csi2rxss.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/media/platform/xilinx/xilinx-csi2rxss.c b/drivers/media/platform/xilinx/xilinx-csi2rxss.c
> index 29b53febc2e7..080e2483cc92 100644
> --- a/drivers/media/platform/xilinx/xilinx-csi2rxss.c
> +++ b/drivers/media/platform/xilinx/xilinx-csi2rxss.c
> @@ -976,11 +976,9 @@ static int xcsi2rxss_probe(struct platform_device *pdev)
>  	/* Reset GPIO */
>  	xcsi2rxss->rst_gpio = devm_gpiod_get_optional(dev, "video-reset",
>  						      GPIOD_OUT_HIGH);
> -	if (IS_ERR(xcsi2rxss->rst_gpio)) {
> -		if (PTR_ERR(xcsi2rxss->rst_gpio) != -EPROBE_DEFER)
> -			dev_err(dev, "Video Reset GPIO not setup in DT");
> -		return PTR_ERR(xcsi2rxss->rst_gpio);
> -	}
> +	if (IS_ERR(xcsi2rxss->rst_gpio))
> +		return dev_err_probe(dev, PTR_ERR(xcsi2rxss->rst_gpio),
> +				     "Video Reset GPIO not setup in DT");
>  
>  	ret = xcsi2rxss_parse_of(xcsi2rxss);
>  	if (ret < 0)

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 13/13] media: uvcvideo: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:24PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/usb/uvc/uvc_driver.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index 744051b52e12..94f84c3c4712 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -1554,12 +1554,9 @@ static int uvc_gpio_parse(struct uvc_device *dev)
>  		return PTR_ERR_OR_ZERO(gpio_privacy);
>  
>  	irq = gpiod_to_irq(gpio_privacy);
> -	if (irq < 0) {
> -		if (irq != EPROBE_DEFER)
> -			dev_err(&dev->udev->dev,
> -				"No IRQ for privacy GPIO (%d)\n", irq);
> -		return irq;
> -	}
> +	if (irq < 0)
> +		return dev_err_probe(&dev->udev->dev, irq,
> +				     "No IRQ for privacy GPIO\n");
>  
>  	unit = uvc_alloc_entity(UVC_EXT_GPIO_UNIT, UVC_EXT_GPIO_UNIT_ID, 0, 1);
>  	if (!unit)

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 08/13] media: omap3isp: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:19PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/platform/ti/omap3isp/isp.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/ti/omap3isp/isp.c b/drivers/media/platform/ti/omap3isp/isp.c
> index a6052df9bb19..5d6867b8f197 100644
> --- a/drivers/media/platform/ti/omap3isp/isp.c
> +++ b/drivers/media/platform/ti/omap3isp/isp.c
> @@ -1886,8 +1886,7 @@ static int isp_initialize_modules(struct isp_device *isp)
>  
>  	ret = omap3isp_ccp2_init(isp);
>  	if (ret < 0) {
> -		if (ret != -EPROBE_DEFER)
> -			dev_err(isp->dev, "CCP2 initialization failed\n");
> +		dev_err_probe(isp->dev, ret, "CCP2 initialization failed\n");
>  		goto error_ccp2;
>  	}
>  

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 09/13] media: xilinx: csi2rxss: Switch to use dev_err_probe() helper

[Laurent Pinchart]

On Mon, Sep 19, 2022 at 04:58:54PM +0300, Laurent Pinchart wrote:
> Hi Yang,
> 
> Thank you for the patch.
> 
> On Thu, Sep 15, 2022 at 11:03:20PM +0800, Yang Yingliang wrote:
> > In the probe path, dev_err() can be replace with dev_err_probe()
> > which will check if error code is -EPROBE_DEFER.
> > 
> > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> > ---
> >  drivers/media/platform/xilinx/xilinx-csi2rxss.c | 8 +++-----
> >  1 file changed, 3 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/media/platform/xilinx/xilinx-csi2rxss.c b/drivers/media/platform/xilinx/xilinx-csi2rxss.c
> > index 29b53febc2e7..080e2483cc92 100644
> > --- a/drivers/media/platform/xilinx/xilinx-csi2rxss.c
> > +++ b/drivers/media/platform/xilinx/xilinx-csi2rxss.c
> > @@ -976,11 +976,9 @@ static int xcsi2rxss_probe(struct platform_device *pdev)
> >  	/* Reset GPIO */
> >  	xcsi2rxss->rst_gpio = devm_gpiod_get_optional(dev, "video-reset",
> >  						      GPIOD_OUT_HIGH);
> > -	if (IS_ERR(xcsi2rxss->rst_gpio)) {
> > -		if (PTR_ERR(xcsi2rxss->rst_gpio) != -EPROBE_DEFER)
> > -			dev_err(dev, "Video Reset GPIO not setup in DT");
> > -		return PTR_ERR(xcsi2rxss->rst_gpio);
> > -	}
> > +	if (IS_ERR(xcsi2rxss->rst_gpio))
> > +		return dev_err_probe(dev, PTR_ERR(xcsi2rxss->rst_gpio),
> > +				     "Video Reset GPIO not setup in DT");

Actually, while at it, could you add the missing \n at the end of the
message ?

> >  
> >  	ret = xcsi2rxss_parse_of(xcsi2rxss);
> >  	if (ret < 0)

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 03/13] media: i2c: imx274: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:14PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>  drivers/media/i2c/imx274.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
> index a00761b1e18c..0df515ab2cbf 100644
> --- a/drivers/media/i2c/imx274.c
> +++ b/drivers/media/i2c/imx274.c
> @@ -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");

While at it, could you add the missing \n at the end of the message ?
With this fixed,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

>  		goto err_me;
>  	}
>  

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 11/13] media: rc: gpio-ir-tx: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:22PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/rc/gpio-ir-tx.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/media/rc/gpio-ir-tx.c b/drivers/media/rc/gpio-ir-tx.c
> index d3063ddb472e..2b829c146db1 100644
> --- a/drivers/media/rc/gpio-ir-tx.c
> +++ b/drivers/media/rc/gpio-ir-tx.c
> @@ -174,12 +174,9 @@ static int gpio_ir_tx_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  
>  	gpio_ir->gpio = devm_gpiod_get(&pdev->dev, NULL, GPIOD_OUT_LOW);
> -	if (IS_ERR(gpio_ir->gpio)) {
> -		if (PTR_ERR(gpio_ir->gpio) != -EPROBE_DEFER)
> -			dev_err(&pdev->dev, "Failed to get gpio (%ld)\n",
> -				PTR_ERR(gpio_ir->gpio));
> -		return PTR_ERR(gpio_ir->gpio);
> -	}
> +	if (IS_ERR(gpio_ir->gpio))
> +		return dev_err_probe(&pdev->dev, PTR_ERR(gpio_ir->gpio),
> +				     "Failed to get gpio\n");
>  
>  	rcdev->priv = gpio_ir;
>  	rcdev->driver_name = DRIVER_NAME;

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 07/13] media: stm32-dcmi: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:18PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/platform/st/stm32/stm32-dcmi.c | 27 +++++++-------------
>  1 file changed, 9 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/media/platform/st/stm32/stm32-dcmi.c b/drivers/media/platform/st/stm32/stm32-dcmi.c
> index 2ca95ab2b0fe..ec138843d090 100644
> --- a/drivers/media/platform/st/stm32/stm32-dcmi.c
> +++ b/drivers/media/platform/st/stm32/stm32-dcmi.c
> @@ -1946,12 +1946,9 @@ static int dcmi_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  
>  	dcmi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
> -	if (IS_ERR(dcmi->rstc)) {
> -		if (PTR_ERR(dcmi->rstc) != -EPROBE_DEFER)
> -			dev_err(&pdev->dev, "Could not get reset control\n");
> -
> -		return PTR_ERR(dcmi->rstc);
> -	}
> +	if (IS_ERR(dcmi->rstc))
> +		return dev_err_probe(&pdev->dev, PTR_ERR(dcmi->rstc),
> +				     "Could not get reset control\n");
>  
>  	/* Get bus characteristics from devicetree */
>  	np = of_graph_get_next_endpoint(np, NULL);
> @@ -2003,20 +2000,14 @@ static int dcmi_probe(struct platform_device *pdev)
>  	}
>  
>  	mclk = devm_clk_get(&pdev->dev, "mclk");
> -	if (IS_ERR(mclk)) {
> -		if (PTR_ERR(mclk) != -EPROBE_DEFER)
> -			dev_err(&pdev->dev, "Unable to get mclk\n");
> -		return PTR_ERR(mclk);
> -	}
> +	if (IS_ERR(mclk))
> +		return dev_err_probe(&pdev->dev, PTR_ERR(mclk),
> +				     "Unable to get mclk\n");
>  
>  	chan = dma_request_chan(&pdev->dev, "tx");
> -	if (IS_ERR(chan)) {
> -		ret = PTR_ERR(chan);
> -		if (ret != -EPROBE_DEFER)
> -			dev_err(&pdev->dev,
> -				"Failed to request DMA channel: %d\n", ret);
> -		return ret;
> -	}
> +	if (IS_ERR(chan))
> +		return dev_err_probe(&pdev->dev, PTR_ERR(chan),
> +				     "Failed to request DMA channel\n");
>  
>  	dcmi->dma_max_burst = UINT_MAX;
>  	ret = dma_get_slave_caps(chan, &caps);

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 06/13] media: platform: exynos4-is: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:17PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>  drivers/media/platform/samsung/exynos4-is/media-dev.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/samsung/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c
> index 52b43ea04030..b7977d8da8e5 100644
> --- a/drivers/media/platform/samsung/exynos4-is/media-dev.c
> +++ b/drivers/media/platform/samsung/exynos4-is/media-dev.c
> @@ -1473,9 +1473,7 @@ static int fimc_md_probe(struct platform_device *pdev)
>  
>  	pinctrl = devm_pinctrl_get(dev);
>  	if (IS_ERR(pinctrl)) {
> -		ret = PTR_ERR(pinctrl);
> -		if (ret != EPROBE_DEFER)
> -			dev_err(dev, "Failed to get pinctrl: %d\n", ret);
> +		dev_err_probe(dev, PTR_ERR(pinctrl), "Failed to get pinctrl\n");

You need to set ret here.

>  		goto err_clk;
>  	}
>  

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 04/13] media: i2c: tc358743: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:15PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()

s/replace/replaced/

Same for all the other patches in this series.

> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/i2c/tc358743.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
> index 200841c1f5cf..9197fa0b1bc2 100644
> --- a/drivers/media/i2c/tc358743.c
> +++ b/drivers/media/i2c/tc358743.c
> @@ -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) {

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 01/13] media: platform: stm32-cec: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:12PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/cec/platform/stm32/stm32-cec.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/media/cec/platform/stm32/stm32-cec.c b/drivers/media/cec/platform/stm32/stm32-cec.c
> index 40db7911b437..7b2db46a5722 100644
> --- a/drivers/media/cec/platform/stm32/stm32-cec.c
> +++ b/drivers/media/cec/platform/stm32/stm32-cec.c
> @@ -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) {

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 12/13] media: rc: ir-rx51: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:23PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/rc/ir-rx51.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
> index a3b145183260..85080c3d2053 100644
> --- a/drivers/media/rc/ir-rx51.c
> +++ b/drivers/media/rc/ir-rx51.c
> @@ -231,13 +231,8 @@ static int ir_rx51_probe(struct platform_device *dev)
>  	struct rc_dev *rcdev;
>  
>  	pwm = pwm_get(&dev->dev, NULL);
> -	if (IS_ERR(pwm)) {
> -		int err = PTR_ERR(pwm);
> -
> -		if (err != -EPROBE_DEFER)
> -			dev_err(&dev->dev, "pwm_get failed: %d\n", err);
> -		return err;
> -	}
> +	if (IS_ERR(pwm))
> +		return dev_err_probe(&dev->dev, PTR_ERR(pwm), "pwm_get failed\n");
>  
>  	/* Use default, in case userspace does not set the carrier */
>  	ir_rx51.freq = DIV_ROUND_CLOSEST_ULL(pwm_get_period(pwm), NSEC_PER_SEC);

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 02/13] media: i2c: ad5820: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:13PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/i2c/ad5820.c | 18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c
> index 516de278cc49..6a7f8ef9db05 100644
> --- a/drivers/media/i2c/ad5820.c
> +++ b/drivers/media/i2c/ad5820.c
> @@ -301,21 +301,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);
>  

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 05/13] media: platform: mtk_mdp_comp: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

Thank you for the patch.

On Thu, Sep 15, 2022 at 11:03:16PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
> index 1e3833f1c9ae..ad5fab2d8bfa 100644
> --- a/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
> +++ b/drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c
> @@ -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;
>  		}
>  

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 00/13] media: Switch to use dev_err_probe() helper

[Laurent Pinchart]

Hi Yang,

On Thu, Sep 15, 2022 at 11:03:11PM +0800, Yang Yingliang wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER. It will print
> error code in a human readable way and simplify the code.

How would you like to get this merged ? A few patches need fixes, and
all of them could benefit from a typo fix in the commit message. If you
send a v2, it could be merged in one go instead of individual
maintainers taking patches in their tree. Hans, would you handle this ?

> Yang Yingliang (13):
>   media: platform: stm32-cec: Switch to use dev_err_probe() helper
>   media: i2c: ad5820: Switch to use dev_err_probe() helper
>   media: i2c: imx274: Switch to use dev_err_probe() helper
>   media: i2c: tc358743: Switch to use dev_err_probe() helper
>   media: platform: mtk_mdp_comp: Switch to use dev_err_probe() helper
>   media: platform: exynos4-is: Switch to use dev_err_probe() helper
>   media: stm32-dcmi: Switch to use dev_err_probe() helper
>   media: omap3isp: Switch to use dev_err_probe() helper
>   media: xilinx: csi2rxss: Switch to use dev_err_probe() helper
>   media: rc: gpio-ir-recv: Switch to use dev_err_probe() helper
>   media: rc: gpio-ir-tx: Switch to use dev_err_probe() helper
>   media: rc: ir-rx51: Switch to use dev_err_probe() helper
>   media: uvcvideo: Switch to use dev_err_probe() helper
> 
>  drivers/media/cec/platform/stm32/stm32-cec.c  |  9 +++----
>  drivers/media/i2c/ad5820.c                    | 18 +++++--------
>  drivers/media/i2c/imx274.c                    |  5 ++--
>  drivers/media/i2c/tc358743.c                  |  9 +++----
>  .../platform/mediatek/mdp/mtk_mdp_comp.c      |  5 ++--
>  .../platform/samsung/exynos4-is/media-dev.c   |  4 +--
>  drivers/media/platform/st/stm32/stm32-dcmi.c  | 27 +++++++------------
>  drivers/media/platform/ti/omap3isp/isp.c      |  3 +--
>  .../media/platform/xilinx/xilinx-csi2rxss.c   |  8 +++---
>  drivers/media/rc/gpio-ir-recv.c               | 10 +++----
>  drivers/media/rc/gpio-ir-tx.c                 |  9 +++----
>  drivers/media/rc/ir-rx51.c                    |  9 ++-----
>  drivers/media/usb/uvc/uvc_driver.c            |  9 +++----
>  13 files changed, 41 insertions(+), 84 deletions(-)

-- 
Regards,

Laurent Pinchart

Re: [PATCH -next 00/13] media: Switch to use dev_err_probe() helper

[Yang Yingliang]

On 2022/9/19 22:42, Laurent Pinchart wrote:
> Hi Yang,
>
> On Thu, Sep 15, 2022 at 11:03:11PM +0800, Yang Yingliang wrote:
>> In the probe path, dev_err() can be replace with dev_err_probe()
>> which will check if error code is -EPROBE_DEFER. It will print
>> error code in a human readable way and simplify the code.
> How would you like to get this merged ? A few patches need fixes, and
> all of them could benefit from a typo fix in the commit message. If you
> send a v2, it could be merged in one go instead of individual
> maintainers taking patches in their tree. Hans, would you handle this ?
OK, I can merge them in one and send a v2.

Thanks,
Yang
>
>> Yang Yingliang (13):
>>    media: platform: stm32-cec: Switch to use dev_err_probe() helper
>>    media: i2c: ad5820: Switch to use dev_err_probe() helper
>>    media: i2c: imx274: Switch to use dev_err_probe() helper
>>    media: i2c: tc358743: Switch to use dev_err_probe() helper
>>    media: platform: mtk_mdp_comp: Switch to use dev_err_probe() helper
>>    media: platform: exynos4-is: Switch to use dev_err_probe() helper
>>    media: stm32-dcmi: Switch to use dev_err_probe() helper
>>    media: omap3isp: Switch to use dev_err_probe() helper
>>    media: xilinx: csi2rxss: Switch to use dev_err_probe() helper
>>    media: rc: gpio-ir-recv: Switch to use dev_err_probe() helper
>>    media: rc: gpio-ir-tx: Switch to use dev_err_probe() helper
>>    media: rc: ir-rx51: Switch to use dev_err_probe() helper
>>    media: uvcvideo: Switch to use dev_err_probe() helper
>>
>>   drivers/media/cec/platform/stm32/stm32-cec.c  |  9 +++----
>>   drivers/media/i2c/ad5820.c                    | 18 +++++--------
>>   drivers/media/i2c/imx274.c                    |  5 ++--
>>   drivers/media/i2c/tc358743.c                  |  9 +++----
>>   .../platform/mediatek/mdp/mtk_mdp_comp.c      |  5 ++--
>>   .../platform/samsung/exynos4-is/media-dev.c   |  4 +--
>>   drivers/media/platform/st/stm32/stm32-dcmi.c  | 27 +++++++------------
>>   drivers/media/platform/ti/omap3isp/isp.c      |  3 +--
>>   .../media/platform/xilinx/xilinx-csi2rxss.c   |  8 +++---
>>   drivers/media/rc/gpio-ir-recv.c               | 10 +++----
>>   drivers/media/rc/gpio-ir-tx.c                 |  9 +++----
>>   drivers/media/rc/ir-rx51.c                    |  9 ++-----
>>   drivers/media/usb/uvc/uvc_driver.c            |  9 +++----
>>   13 files changed, 41 insertions(+), 84 deletions(-)