All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johan Hovold <johan+linaro@kernel.org>
To: Vinod Koul <vkoul@kernel.org>
Cc: Kishon Vijay Abraham I <kishon@kernel.org>,
	Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>,
	Abel Vesa <abel.vesa@linaro.org>,
	linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org,
	Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 3/7] phy: phy-snps-eusb2: rename phy_init() clock error label
Date: Fri, 23 May 2025 10:48:35 +0200	[thread overview]
Message-ID: <20250523084839.11015-4-johan+linaro@kernel.org> (raw)
In-Reply-To: <20250523084839.11015-1-johan+linaro@kernel.org>

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


-- 
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy

WARNING: multiple messages have this Message-ID (diff)
From: Johan Hovold <johan+linaro@kernel.org>
To: Vinod Koul <vkoul@kernel.org>
Cc: Kishon Vijay Abraham I <kishon@kernel.org>,
	Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>,
	Abel Vesa <abel.vesa@linaro.org>,
	linux-phy@lists.infradead.org, linux-kernel@vger.kernel.org,
	Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 3/7] phy: phy-snps-eusb2: rename phy_init() clock error label
Date: Fri, 23 May 2025 10:48:35 +0200	[thread overview]
Message-ID: <20250523084839.11015-4-johan+linaro@kernel.org> (raw)
In-Reply-To: <20250523084839.11015-1-johan+linaro@kernel.org>

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


  parent reply	other threads:[~2025-05-23  9:53 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-23  8:48 [PATCH 0/7] phy: phy-snps-eusb2: fixes and cleanups Johan Hovold
2025-05-23  8:48 ` Johan Hovold
2025-05-23  8:48 ` [PATCH 1/7] phy: phy-snps-eusb2: fix clock imbalance on phy_exit() Johan Hovold
2025-05-23  8:48   ` Johan Hovold
2025-05-25 13:17   ` Ivaylo Ivanov
2025-05-25 13:17     ` Ivaylo Ivanov
2025-05-26  7:49   ` neil.armstrong
2025-05-26  7:49     ` neil.armstrong
2025-05-23  8:48 ` [PATCH 2/7] phy: phy-snps-eusb2: fix repeater imbalance on phy_init() failure Johan Hovold
2025-05-23  8:48   ` Johan Hovold
2025-05-26  7:49   ` Neil Armstrong
2025-05-26  7:49     ` Neil Armstrong
2025-05-23  8:48 ` Johan Hovold [this message]
2025-05-23  8:48   ` [PATCH 3/7] phy: phy-snps-eusb2: rename phy_init() clock error label Johan Hovold
2025-05-26  7:49   ` neil.armstrong
2025-05-26  7:49     ` neil.armstrong
2025-05-23  8:48 ` [PATCH 4/7] phy: phy-snps-eusb2: clean up error messages Johan Hovold
2025-05-23  8:48   ` Johan Hovold
2025-05-26  7:50   ` neil.armstrong
2025-05-26  7:50     ` neil.armstrong
2025-05-23  8:48 ` [PATCH 5/7] phy: phy-snps-eusb2: fix optional phy lookup parameter Johan Hovold
2025-05-23  8:48   ` Johan Hovold
2025-05-26  8:27   ` neil.armstrong
2025-05-26  8:27     ` neil.armstrong
2025-05-23  8:48 ` [PATCH 6/7] phy: phy-snps-eusb2: drop unnecessary loop index declarations Johan Hovold
2025-05-23  8:48   ` Johan Hovold
2025-05-26  8:27   ` neil.armstrong
2025-05-26  8:27     ` neil.armstrong
2025-05-23  8:48 ` [PATCH 7/7] phy: phy-snps-eusb2: clean up id table sentinel Johan Hovold
2025-05-23  8:48   ` Johan Hovold
2025-05-23  8:57 ` [PATCH 0/7] phy: phy-snps-eusb2: fixes and cleanups Abel Vesa
2025-05-23  8:57   ` Abel Vesa
2025-06-15 16:53 ` Vinod Koul
2025-06-15 16:53   ` Vinod Koul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250523084839.11015-4-johan+linaro@kernel.org \
    --to=johan+linaro@kernel.org \
    --cc=abel.vesa@linaro.org \
    --cc=ivo.ivanov.ivanov1@gmail.com \
    --cc=kishon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-phy@lists.infradead.org \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.