[PATCH 3/7] phy: phy-snps-eusb2: rename phy_init() clock error label

Johan Hovold posted 7 patches 6 months, 3 weeks ago
[PATCH 3/7] phy: phy-snps-eusb2: rename phy_init() clock error label
Posted by Johan Hovold 6 months, 3 weeks ago
Rename the clock error label which is now used to disable all clocks and
not just the ref clock on phy_init() errors.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/phy/phy-snps-eusb2.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c
index a799c3d2bcfb..c8f14f8fb9ac 100644
--- a/drivers/phy/phy-snps-eusb2.c
+++ b/drivers/phy/phy-snps-eusb2.c
@@ -474,7 +474,7 @@ static int snps_eusb2_hsphy_init(struct phy *p)
 	ret = reset_control_assert(phy->phy_reset);
 	if (ret) {
 		dev_err(&p->dev, "failed to assert phy_reset, %d\n", ret);
-		goto disable_ref_clk;
+		goto disable_clks;
 	}
 
 	usleep_range(100, 150);
@@ -482,16 +482,16 @@ static int snps_eusb2_hsphy_init(struct phy *p)
 	ret = reset_control_deassert(phy->phy_reset);
 	if (ret) {
 		dev_err(&p->dev, "failed to de-assert phy_reset, %d\n", ret);
-		goto disable_ref_clk;
+		goto disable_clks;
 	}
 
 	ret = phy->data->phy_init(p);
 	if (ret)
-		goto disable_ref_clk;
+		goto disable_clks;
 
 	return 0;
 
-disable_ref_clk:
+disable_clks:
 	clk_bulk_disable_unprepare(phy->data->num_clks, phy->clks);
 exit_repeater:
 	phy_exit(phy->repeater);
-- 
2.49.0
Re: [PATCH 3/7] phy: phy-snps-eusb2: rename phy_init() clock error label
Posted by neil.armstrong@linaro.org 6 months, 3 weeks ago
On 23/05/2025 10:48, Johan Hovold wrote:
> Rename the clock error label which is now used to disable all clocks and
> not just the ref clock on phy_init() errors.
> 
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
>   drivers/phy/phy-snps-eusb2.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/phy/phy-snps-eusb2.c b/drivers/phy/phy-snps-eusb2.c
> index a799c3d2bcfb..c8f14f8fb9ac 100644
> --- a/drivers/phy/phy-snps-eusb2.c
> +++ b/drivers/phy/phy-snps-eusb2.c
> @@ -474,7 +474,7 @@ static int snps_eusb2_hsphy_init(struct phy *p)
>   	ret = reset_control_assert(phy->phy_reset);
>   	if (ret) {
>   		dev_err(&p->dev, "failed to assert phy_reset, %d\n", ret);
> -		goto disable_ref_clk;
> +		goto disable_clks;
>   	}
>   
>   	usleep_range(100, 150);
> @@ -482,16 +482,16 @@ static int snps_eusb2_hsphy_init(struct phy *p)
>   	ret = reset_control_deassert(phy->phy_reset);
>   	if (ret) {
>   		dev_err(&p->dev, "failed to de-assert phy_reset, %d\n", ret);
> -		goto disable_ref_clk;
> +		goto disable_clks;
>   	}
>   
>   	ret = phy->data->phy_init(p);
>   	if (ret)
> -		goto disable_ref_clk;
> +		goto disable_clks;
>   
>   	return 0;
>   
> -disable_ref_clk:
> +disable_clks:
>   	clk_bulk_disable_unprepare(phy->data->num_clks, phy->clks);
>   exit_repeater:
>   	phy_exit(phy->repeater);

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>