From: Artem Shimko <a.shimko.dev@gmail.com>
To: andi.shyti@kernel.org, p.zabel@pengutronix.de,
mika.westerberg@linux.intel.com,
andriy.shevchenko@linux.intel.com, jsd@semihalf.com
Cc: Artem Shimko <a.shimko.dev@gmail.com>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v6 2/2] i2c: designware-platdrv: fix cleanup on probe failure
Date: Fri, 30 Jan 2026 14:10:37 +0300 [thread overview]
Message-ID: <20260130111039.874548-3-a.shimko.dev@gmail.com> (raw)
In-Reply-To: <20260130111039.874548-1-a.shimko.dev@gmail.com>
Simplify the error handling in dw_i2c_plat_probe() by consolidating
cleanup operations directly in the error path instead of using a
goto label.
This eliminates the goto statement, makes the error handling more
transparent, and reduces code indirection while maintaining identical
cleanup behavior on probe failure.
Signed-off-by: Artem Shimko <a.shimko.dev@gmail.com>
---
drivers/i2c/busses/i2c-designware-platdrv.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 88e70970c72c..74246fcd5138 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -292,14 +292,11 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
pm_runtime_enable(device);
ret = i2c_dw_probe(dev);
- if (ret)
- goto exit_probe;
-
- return ret;
+ if (ret) {
+ dw_i2c_plat_pm_cleanup(dev);
+ i2c_dw_prepare_clk(dev, false);
+ }
-exit_probe:
- dw_i2c_plat_pm_cleanup(dev);
- i2c_dw_prepare_clk(dev, false);
return ret;
}
--
2.43.0
next prev parent reply other threads:[~2026-01-30 11:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-30 11:10 [PATCH v6 0/2] i2c: designware-platdrv: simplify reset control and fix cleanup on probe failure Artem Shimko
2026-01-30 11:10 ` [PATCH v6 1/2] i2c: designware-platdrv: simplify reset control Artem Shimko
2026-02-02 9:21 ` Mika Westerberg
2026-02-04 1:43 ` Andi Shyti
2026-02-04 1:50 ` Andy Shevchenko
2026-02-05 7:57 ` Artem Shimko
2026-02-05 7:56 ` Artem Shimko
2026-02-05 10:27 ` Andi Shyti
2026-02-05 10:56 ` Artem Shimko
2026-01-30 11:10 ` Artem Shimko [this message]
2026-02-02 9:22 ` [PATCH v6 2/2] i2c: designware-platdrv: fix cleanup on probe failure Mika Westerberg
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=20260130111039.874548-3-a.shimko.dev@gmail.com \
--to=a.shimko.dev@gmail.com \
--cc=andi.shyti@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=jsd@semihalf.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=p.zabel@pengutronix.de \
/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