2023-09-23 22:45:55

by Michał Mirosław

Subject: [PATCH 3/3] usb: chipidea: tegra: Consistently use dev_err_probe()

Convert all error exits from probe() to dev_err_probe().

Signed-off-by: Michał Mirosław <[email protected]>
---
drivers/usb/chipidea/ci_hdrc_tegra.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
index 8e78bf643e25..2cc305803217 100644
--- a/drivers/usb/chipidea/ci_hdrc_tegra.c
+++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
@@ -293,14 +293,12 @@ static int tegra_usb_probe(struct platform_device *pdev)
usb->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "nvidia,phy", 0);
if (IS_ERR(usb->phy))
return dev_err_probe(&pdev->dev, PTR_ERR(usb->phy),
- "failed to get PHY\n");
+ "failed to get PHY");

usb->clk = devm_clk_get(&pdev->dev, NULL);
- if (IS_ERR(usb->clk)) {
- err = PTR_ERR(usb->clk);
- dev_err(&pdev->dev, "failed to get clock: %d\n", err);
- return err;
- }
+ if (IS_ERR(usb->clk))
+ return dev_err_probe(&pdev->dev, PTR_ERR(usb->clk),
+ "failed to get clock");

err = devm_tegra_core_dev_init_opp_table_common(&pdev->dev);
if (err)
@@ -316,7 +314,7 @@ static int tegra_usb_probe(struct platform_device *pdev)

err = tegra_usb_reset_controller(&pdev->dev);
if (err) {
- dev_err(&pdev->dev, "failed to reset controller: %d\n", err);
+ dev_err_probe(&pdev->dev, err, "failed to reset controller");
goto fail_power_off;
}

@@ -347,8 +345,8 @@ static int tegra_usb_probe(struct platform_device *pdev)
usb->dev = ci_hdrc_add_device(&pdev->dev, pdev->resource,
pdev->num_resources, &usb->data);
if (IS_ERR(usb->dev)) {
- err = PTR_ERR(usb->dev);
- dev_err(&pdev->dev, "failed to add HDRC device: %d\n", err);
+ err = dev_err_probe(&pdev->dev, PTR_ERR(usb->dev),
+ "failed to add HDRC device");
goto phy_shutdown;
}

--
2.39.2

2023-09-25 11:48:32

by Peter Chen

Subject: Re: [PATCH 3/3] usb: chipidea: tegra: Consistently use dev_err_probe()

On 23-09-23 21:41:56, Michał Mirosław wrote:
> Convert all error exits from probe() to dev_err_probe().
>
> Signed-off-by: Michał Mirosław <[email protected]>

Acked-by: Peter Chen <[email protected]>

Peter
> ---
> drivers/usb/chipidea/ci_hdrc_tegra.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
> index 8e78bf643e25..2cc305803217 100644
> --- a/drivers/usb/chipidea/ci_hdrc_tegra.c
> +++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
> @@ -293,14 +293,12 @@ static int tegra_usb_probe(struct platform_device *pdev)
> usb->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "nvidia,phy", 0);
> if (IS_ERR(usb->phy))
> return dev_err_probe(&pdev->dev, PTR_ERR(usb->phy),
> - "failed to get PHY\n");
> + "failed to get PHY");
>
> usb->clk = devm_clk_get(&pdev->dev, NULL);
> - if (IS_ERR(usb->clk)) {
> - err = PTR_ERR(usb->clk);
> - dev_err(&pdev->dev, "failed to get clock: %d\n", err);
> - return err;
> - }
> + if (IS_ERR(usb->clk))
> + return dev_err_probe(&pdev->dev, PTR_ERR(usb->clk),
> + "failed to get clock");
>
> err = devm_tegra_core_dev_init_opp_table_common(&pdev->dev);
> if (err)
> @@ -316,7 +314,7 @@ static int tegra_usb_probe(struct platform_device *pdev)
>
> err = tegra_usb_reset_controller(&pdev->dev);
> if (err) {
> - dev_err(&pdev->dev, "failed to reset controller: %d\n", err);
> + dev_err_probe(&pdev->dev, err, "failed to reset controller");
> goto fail_power_off;
> }
>
> @@ -347,8 +345,8 @@ static int tegra_usb_probe(struct platform_device *pdev)
> usb->dev = ci_hdrc_add_device(&pdev->dev, pdev->resource,
> pdev->num_resources, &usb->data);
> if (IS_ERR(usb->dev)) {
> - err = PTR_ERR(usb->dev);
> - dev_err(&pdev->dev, "failed to add HDRC device: %d\n", err);
> + err = dev_err_probe(&pdev->dev, PTR_ERR(usb->dev),
> + "failed to add HDRC device");
> goto phy_shutdown;
> }
>
> --
> 2.39.2
>

--

Thanks,
Peter Chen