[-next,07/13] media: stm32-dcmi: Switch to use dev_err_probe() helper
Commit Message
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(-)
Comments
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);
@@ -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);