From: Artem Shimko <a.shimko.dev@gmail.com>
To: wim@linux-watchdog.org, linux@roeck-us.net,
p.zabel@pengutronix.de, Sergey.Semin@baikalelectronics.ru,
mika.westerberg@linux.intel.com, andi.shyti@kernel.org
Cc: Artem Shimko <a.shimko.dev@gmail.com>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] watchdog: dw_wdt: clean up error paths in resume function
Date: Fri, 20 Mar 2026 16:56:22 +0300 [thread overview]
Message-ID: <20260320135624.223863-6-a.shimko.dev@gmail.com> (raw)
In-Reply-To: <20260320135624.223863-1-a.shimko.dev@gmail.com>
Clean up of dw_wdt_resume() function.
Rework the error handling to use properly named labels that match the
cleanup order. Use unprepare_clk for clock disable and unprepare_pclk
for pclk disable path.
Signed-off-by: Artem Shimko <a.shimko.dev@gmail.com>
---
drivers/watchdog/dw_wdt.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index c2c5dc6e54e7..c89e1fb91b1f 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -393,16 +393,15 @@ static int dw_wdt_suspend(struct device *dev)
static int dw_wdt_resume(struct device *dev)
{
struct dw_wdt *dw_wdt = dev_get_drvdata(dev);
- int err = clk_prepare_enable(dw_wdt->clk);
+ int err;
+ err = clk_prepare_enable(dw_wdt->clk);
if (err)
return err;
err = clk_prepare_enable(dw_wdt->pclk);
- if (err) {
- clk_disable_unprepare(dw_wdt->clk);
- return err;
- }
+ if (err)
+ goto unprepare_clk;
err = reset_control_deassert(dw_wdt->rst);
if (err)
@@ -415,8 +414,9 @@ static int dw_wdt_resume(struct device *dev)
return 0;
-unprepare_clk:
+unprepare_pclk:
clk_disable_unprepare(dw_wdt->pclk);
+unprepare_clk:
clk_disable_unprepare(dw_wdt->clk);
return err;
--
2.43.0
prev parent reply other threads:[~2026-03-20 13:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-20 13:56 [PATCH 0/5] watchdog: dw_wdt: reset clean up and pm Artem Shimko
2026-03-20 13:56 ` [PATCH 1/5] watchdog: dw_wdt: move reset control deassertion before register access Artem Shimko
2026-03-20 13:56 ` [PATCH 2/5] watchdog: dw_wdt: add error handling for reset control deassertion Artem Shimko
2026-03-20 13:56 ` [PATCH 3/5] watchdog: dw_wdt: Use devm_reset_control_get_optional_shared_deasserted Artem Shimko
2026-03-20 13:56 ` [PATCH 4/5] watchdog: dw_wdt: manage reset line during system suspend/resume Artem Shimko
2026-03-20 13:56 ` Artem Shimko [this message]
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=20260320135624.223863-6-a.shimko.dev@gmail.com \
--to=a.shimko.dev@gmail.com \
--cc=Sergey.Semin@baikalelectronics.ru \
--cc=andi.shyti@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mika.westerberg@linux.intel.com \
--cc=p.zabel@pengutronix.de \
--cc=wim@linux-watchdog.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox