From: Johan Hovold <johan@kernel.org>
To: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: Andi Shyti <andi.shyti@kernel.org>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>
Subject: [PATCH v2 9/9] i2c: core: clean up adapter registration error label
Date: Fri, 8 May 2026 11:03:11 +0200 [thread overview]
Message-ID: <20260508090311.379333-10-johan@kernel.org> (raw)
In-Reply-To: <20260508090311.379333-1-johan@kernel.org>
Clean up the adapter registration error labels by making sure that also
the last one is named after what it does.
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/i2c/i2c-core-base.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 5350ee54132b..029ebe44c68e 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -1618,7 +1618,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
res = i2c_setup_smbus_alert(adap);
if (res)
- goto out_reg;
+ goto err_deregister_clients;
dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
@@ -1637,7 +1637,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
return 0;
-out_reg:
+err_deregister_clients:
i2c_deregister_clients(adap);
device_del(&adap->dev);
err_remove_debugfs:
--
2.53.0
prev parent reply other threads:[~2026-05-08 9:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-08 9:03 [PATCH v2 0/9] i2c: core: adapter registration fixes Johan Hovold
2026-05-08 9:03 ` [PATCH v2 1/9] i2c: core: fix irq domain leak on adapter registration failure Johan Hovold
2026-05-08 9:03 ` [PATCH v2 2/9] i2c: core: fix hang " Johan Hovold
2026-05-08 9:03 ` [PATCH v2 3/9] i2c: core: fix adapter probe deferral loop Johan Hovold
2026-05-08 9:03 ` [PATCH v2 4/9] i2c: core: fix adapter debugfs creation Johan Hovold
2026-05-08 9:03 ` [PATCH v2 5/9] i2c: core: disable runtime PM on adapter registration failure Johan Hovold
2026-05-08 9:03 ` [PATCH v2 6/9] i2c: core: fix adapter registration race Johan Hovold
2026-05-08 9:03 ` [PATCH v2 7/9] i2c: core: fix adapter deregistration race Johan Hovold
2026-05-08 9:03 ` [PATCH v2 8/9] i2c: core: clean up bus id allocation Johan Hovold
2026-05-08 9:03 ` Johan Hovold [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=20260508090311.379333-10-johan@kernel.org \
--to=johan@kernel.org \
--cc=andi.shyti@kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
/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