From: Jackie Liu <liu.yun@linux.dev>
To: linux@roeck-us.net
Cc: jdelvare@suse.com, linux-hwmon@vger.kernel.org, liu.yun@linux.dev
Subject: [PATCH 4/5] hwmon: (d5next) Use devres function
Date: Wed, 22 Dec 2021 10:01:13 +0800 [thread overview]
Message-ID: <20211222020114.3524736-4-liu.yun@linux.dev> (raw)
In-Reply-To: <20211222020114.3524736-1-liu.yun@linux.dev>
From: Jackie Liu <liuyun01@kylinos.cn>
Use devm_hwmon_device_register_with_info() and remove hwmon_dev
from d5next_data struct as it is not needed anymore.
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
---
drivers/hwmon/aquacomputer_d5next.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/hwmon/aquacomputer_d5next.c b/drivers/hwmon/aquacomputer_d5next.c
index fb9341a53051..4f6f11169a53 100644
--- a/drivers/hwmon/aquacomputer_d5next.c
+++ b/drivers/hwmon/aquacomputer_d5next.c
@@ -84,7 +84,6 @@ static const char *const label_current[] = {
struct d5next_data {
struct hid_device *hdev;
- struct device *hwmon_dev;
struct dentry *debugfs;
s32 temp_input;
u16 speed_input[2];
@@ -275,6 +274,7 @@ static void d5next_debugfs_init(struct d5next_data *priv)
static int d5next_probe(struct hid_device *hdev, const struct hid_device_id *id)
{
struct d5next_data *priv;
+ struct device *hwmon_dev;
int ret;
priv = devm_kzalloc(&hdev->dev, sizeof(*priv), GFP_KERNEL);
@@ -298,13 +298,12 @@ static int d5next_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (ret)
goto fail_and_stop;
- priv->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "d5next", priv,
- &d5next_chip_info, NULL);
-
- if (IS_ERR(priv->hwmon_dev)) {
- ret = PTR_ERR(priv->hwmon_dev);
+ hwmon_dev =
+ devm_hwmon_device_register_with_info(&hdev->dev, "d5next", priv,
+ &d5next_chip_info, NULL);
+ ret = PTR_ERR_OR_ZERO(hwmon_dev);
+ if (ret)
goto fail_and_close;
- }
d5next_debugfs_init(priv);
@@ -322,7 +321,6 @@ static void d5next_remove(struct hid_device *hdev)
struct d5next_data *priv = hid_get_drvdata(hdev);
debugfs_remove_recursive(priv->debugfs);
- hwmon_device_unregister(priv->hwmon_dev);
hid_hw_close(hdev);
hid_hw_stop(hdev);
--
2.25.1
next prev parent reply other threads:[~2021-12-22 2:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-22 2:01 [PATCH 1/5] hwmon: (corsair-cpro) Use devres function Jackie Liu
2021-12-22 2:01 ` [PATCH 2/5] hwmon: (nzxt-kraken2) " Jackie Liu
2021-12-22 2:01 ` [PATCH 3/5] hwmon: (corsair-psu) " Jackie Liu
2021-12-22 2:01 ` Jackie Liu [this message]
2021-12-22 2:01 ` [PATCH 5/5] hwmon: (drivetemp) " Jackie Liu
2021-12-22 3:03 ` Guenter Roeck
2021-12-22 5:43 ` Jackie Liu
2021-12-22 2:58 ` [PATCH 1/5] hwmon: (corsair-cpro) " Guenter Roeck
2021-12-22 6:13 ` Jackie Liu
2021-12-22 16:10 ` Guenter Roeck
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=20211222020114.3524736-4-liu.yun@linux.dev \
--to=liu.yun@linux.dev \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux@roeck-us.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.