From: Li Zetao <lizetao1@huawei.com>
To: <jikos@kernel.org>, <bentiss@kernel.org>,
<michael.zaidman@gmail.com>, <djogorchock@gmail.com>,
<rrameshbabu@nvidia.com>, <bonbons@linux-vserver.org>,
<roderick.colenbrander@sony.com>, <david@readahead.eu>,
<savicaleksa83@gmail.com>, <me@jackdoan.com>, <jdelvare@suse.com>,
<linux@roeck-us.net>, <mail@mariuszachmann.de>,
<wilken.gottwalt@posteo.net>, <jonas@protocubo.io>,
<mezin.alexander@gmail.com>
Cc: <lizetao1@huawei.com>, <linux-input@vger.kernel.org>,
<linux-i2c@vger.kernel.org>, <linux-hwmon@vger.kernel.org>
Subject: [PATCH -next v3 02/15] HID: cp2112: Use devm_hid_hw_start_and_open in cp2112_probe()
Date: Tue, 10 Sep 2024 23:45:32 +0800 [thread overview]
Message-ID: <20240910154545.736786-3-lizetao1@huawei.com> (raw)
In-Reply-To: <20240910154545.736786-1-lizetao1@huawei.com>
Currently, the cp2112 module needs to maintain hid resources
by itself. Use devm_hid_hw_start_and_open helper to ensure that hid
resources are consistent with the device life cycle, and release
hid resources before device is released. At the same time, it can avoid
the goto-release encoding, drop the err_hid_close and err_hid_stop
lables.
Signed-off-by: Li Zetao <lizetao1@huawei.com>
---
v2 -> v3: None
v2: https://lore.kernel.org/all/20240909012313.500341-3-lizetao1@huawei.com/
v1 -> v2: Adjust commit information
v1: https://lore.kernel.org/all/20240904123607.3407364-3-lizetao1@huawei.com/
drivers/hid/hid-cp2112.c | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
index 20a0d1315d90..6d65c65f1b83 100644
--- a/drivers/hid/hid-cp2112.c
+++ b/drivers/hid/hid-cp2112.c
@@ -1215,22 +1215,14 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)
return ret;
}
- ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW);
- if (ret) {
- hid_err(hdev, "hw start failed\n");
+ ret = devm_hid_hw_start_and_open(hdev, HID_CONNECT_HIDRAW);
+ if (ret)
return ret;
- }
-
- ret = hid_hw_open(hdev);
- if (ret) {
- hid_err(hdev, "hw open failed\n");
- goto err_hid_stop;
- }
ret = hid_hw_power(hdev, PM_HINT_FULLON);
if (ret < 0) {
hid_err(hdev, "power management error: %d\n", ret);
- goto err_hid_close;
+ return ret;
}
ret = cp2112_hid_get(hdev, CP2112_GET_VERSION_INFO, buf, sizeof(buf),
@@ -1334,10 +1326,6 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)
i2c_del_adapter(&dev->adap);
err_power_normal:
hid_hw_power(hdev, PM_HINT_NORMAL);
-err_hid_close:
- hid_hw_close(hdev);
-err_hid_stop:
- hid_hw_stop(hdev);
return ret;
}
@@ -1354,14 +1342,6 @@ static void cp2112_remove(struct hid_device *hdev)
}
gpiochip_remove(&dev->gc);
- /* i2c_del_adapter has finished removing all i2c devices from our
- * adapter. Well behaved devices should no longer call our cp2112_xfer
- * and should have waited for any pending calls to finish. It has also
- * waited for device_unregister(&adap->dev) to complete. Therefore we
- * can safely free our struct cp2112_device.
- */
- hid_hw_close(hdev);
- hid_hw_stop(hdev);
}
static int cp2112_raw_event(struct hid_device *hdev, struct hid_report *report,
--
2.34.1
next prev parent reply other threads:[~2024-09-10 15:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-10 15:45 [PATCH -next v3 00/15] HID: convert to devm_hid_hw_start_and_open() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 01/15] HID: core: Use devm_add_action_or_reset helper to manage hid resources Li Zetao
2024-09-10 15:45 ` Li Zetao [this message]
2024-09-10 15:45 ` [PATCH -next v3 03/15] HID: ft260: Use devm_hid_hw_start_and_open in ft260_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 04/15] HID: mcp2200: Use devm_hid_hw_start_and_open in mcp2200_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 05/15] HID: mcp2221: Use devm_hid_hw_start_and_open in mcp2221_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 06/15] HID: nintendo: Use devm_hid_hw_start_and_open in nintendo_hid_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 07/15] HID: playstation: Use devm_hid_hw_start_and_open in ps_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 08/15] hwmon: (aquacomputer_d5next) Use devm_hid_hw_start_and_open in aqc_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 09/15] hwmon: (asus_rog_ryujin) Use devm_hid_hw_start_and_open in rog_ryujin_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 10/15] hwmon: (corsair-cpro) Use devm_hid_hw_start_and_open in ccp_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 11/15] hwmon: (corsair-psu) Use devm_hid_hw_start_and_open in corsairpsu_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 12/15] hwmon: (gigabyte_waterforce) Use devm_hid_hw_start_and_open in waterforce_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 13/15] hwmon: (nzxt-kraken2) Use devm_hid_hw_start_and_open in kraken2_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 14/15] hwmon: (nzxt-kraken3) Use devm_hid_hw_start_and_open in kraken3_probe() Li Zetao
2024-09-10 15:45 ` [PATCH -next v3 15/15] hwmon: (nzxt-smart2) Use devm_hid_hw_start_and_open in nzxt_smart2_hid_probe() Li Zetao
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=20240910154545.736786-3-lizetao1@huawei.com \
--to=lizetao1@huawei.com \
--cc=bentiss@kernel.org \
--cc=bonbons@linux-vserver.org \
--cc=david@readahead.eu \
--cc=djogorchock@gmail.com \
--cc=jdelvare@suse.com \
--cc=jikos@kernel.org \
--cc=jonas@protocubo.io \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mail@mariuszachmann.de \
--cc=me@jackdoan.com \
--cc=mezin.alexander@gmail.com \
--cc=michael.zaidman@gmail.com \
--cc=roderick.colenbrander@sony.com \
--cc=rrameshbabu@nvidia.com \
--cc=savicaleksa83@gmail.com \
--cc=wilken.gottwalt@posteo.net \
/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