From: Matt Ranostay <matt.ranostay@konsulko.com>
To: jic23@kernel.org, gupt21@gmail.com
Cc: linux-input@vger.kernel.org, linux-i2c@vger.kernel.org,
Matt Ranostay <matt.ranostay@konsulko.com>
Subject: [PATCH v2 4/5] HID: mcp2221: switch i2c registration to devm functions
Date: Sat, 10 Sep 2022 18:40:47 -0700 [thread overview]
Message-ID: <20220911014048.64235-5-matt.ranostay@konsulko.com> (raw)
In-Reply-To: <20220911014048.64235-1-matt.ranostay@konsulko.com>
Switch from i2c_add_adapter() to resource managed devm_i2c_add_adapter()
for matching rest of driver initialization, and more concise code.
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
drivers/hid/hid-mcp2221.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-mcp2221.c b/drivers/hid/hid-mcp2221.c
index de52e9f7bb8c..29e69576c3d4 100644
--- a/drivers/hid/hid-mcp2221.c
+++ b/drivers/hid/hid-mcp2221.c
@@ -873,7 +873,7 @@ static int mcp2221_probe(struct hid_device *hdev,
"MCP2221 usb-i2c bridge on hidraw%d",
((struct hidraw *)hdev->hidraw)->minor);
- ret = i2c_add_adapter(&mcp->adapter);
+ ret = devm_i2c_add_adapter(&hdev->dev, &mcp->adapter);
if (ret) {
hid_err(hdev, "can't add usb-i2c adapter: %d\n", ret);
goto err_i2c;
@@ -884,7 +884,7 @@ static int mcp2221_probe(struct hid_device *hdev,
mcp->gc = devm_kzalloc(&hdev->dev, sizeof(*mcp->gc), GFP_KERNEL);
if (!mcp->gc) {
ret = -ENOMEM;
- goto err_gc;
+ goto err_i2c;
}
mcp->gc->label = "mcp2221_gpio";
@@ -900,12 +900,10 @@ static int mcp2221_probe(struct hid_device *hdev,
ret = devm_gpiochip_add_data(&hdev->dev, mcp->gc, mcp);
if (ret)
- goto err_gc;
+ goto err_i2c;
return 0;
-err_gc:
- i2c_del_adapter(&mcp->adapter);
err_i2c:
hid_hw_close(mcp->hdev);
err_hstop:
@@ -917,7 +915,6 @@ static void mcp2221_remove(struct hid_device *hdev)
{
struct mcp2221 *mcp = hid_get_drvdata(hdev);
- i2c_del_adapter(&mcp->adapter);
hid_hw_close(mcp->hdev);
hid_hw_stop(mcp->hdev);
}
--
2.37.2
next prev parent reply other threads:[~2022-09-11 1:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-11 1:40 [PATCH v2 0/5] HID: mcp2221: iio support and device resource management Matt Ranostay
2022-09-11 1:40 ` [PATCH v2 1/5] i2c: muxes: ltc4306: fix future recursive dependencies Matt Ranostay
2022-09-27 19:36 ` Wolfram Sang
2022-09-11 1:40 ` [PATCH v2 2/5] iio: addac: stx104: " Matt Ranostay
2022-09-11 1:40 ` [PATCH v2 3/5] iio: dac: " Matt Ranostay
2022-09-11 1:40 ` Matt Ranostay [this message]
2022-09-11 1:40 ` [PATCH v2 5/5] HID: mcp2221: add ADC/DAC support via iio subsystem Matt Ranostay
2022-09-12 14:43 ` [PATCH v2 0/5] HID: mcp2221: iio support and device resource management Jonathan Cameron
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=20220911014048.64235-5-matt.ranostay@konsulko.com \
--to=matt.ranostay@konsulko.com \
--cc=gupt21@gmail.com \
--cc=jic23@kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-input@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).