From: W_Armin@gmx.de
To: pali@kernel.org
Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org
Subject: [RFC 2/3] hwmon: (dell-smm-hwmon) Use devm_add_action_or_reset()
Date: Sat, 15 May 2021 20:34:08 +0200 [thread overview]
Message-ID: <20210515183409.682-3-W_Armin@gmx.de> (raw)
In-Reply-To: <20210515183409.682-1-W_Armin@gmx.de>
From: Armin Wolf <W_Armin@gmx.de>
Use devm_add_action_or_reset() for calling i8k_exit_procfs()
for omitting the remove() function in dell_smm_driver.
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
drivers/hwmon/dell-smm-hwmon.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index 006d435a6e78..6f9bc2691491 100644
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -605,24 +605,22 @@ static const struct proc_ops i8k_proc_ops = {
.proc_ioctl = i8k_ioctl,
};
-static void __init i8k_init_procfs(void)
+static void i8k_exit_procfs(void *param)
{
- /* Register the proc entry */
- proc_create("i8k", 0, NULL, &i8k_proc_ops);
+ remove_proc_entry("i8k", NULL);
}
-static void __exit i8k_exit_procfs(void)
+static void __init i8k_init_procfs(struct device *dev)
{
- remove_proc_entry("i8k", NULL);
+ /* Register the proc entry */
+ proc_create("i8k", 0, NULL, &i8k_proc_ops);
+
+ devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
}
#else
-static inline void __init i8k_init_procfs(void)
-{
-}
-
-static inline void __exit i8k_exit_procfs(void)
+static void __init i8k_init_procfs(struct device *dev)
{
}
@@ -1225,14 +1223,7 @@ static int __init dell_smm_probe(struct platform_device *pdev)
if (err)
return err;
- i8k_init_procfs();
-
- return 0;
-}
-
-static int dell_smm_remove(struct platform_device *pdev)
-{
- i8k_exit_procfs();
+ i8k_init_procfs(&pdev->dev);
return 0;
}
@@ -1241,7 +1232,6 @@ static struct platform_driver dell_smm_driver = {
.driver = {
.name = KBUILD_MODNAME,
},
- .remove = dell_smm_remove,
};
static struct platform_device *dell_smm_device;
--
2.20.1
next prev parent reply other threads:[~2021-05-15 18:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 18:34 [RFC 0/3] hwmon: (dell-smm-hwmon) Use platform device W_Armin
2021-05-15 18:34 ` [RFC 1/3] " W_Armin
2021-05-15 18:34 ` W_Armin [this message]
2021-05-15 18:34 ` [RFC 3/3] hwmon: (dell-smm-hwmon) Move variables into a driver private data structure W_Armin
2021-05-16 14:08 ` [RFC 0/3] hwmon: (dell-smm-hwmon) Use platform device 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=20210515183409.682-3-W_Armin@gmx.de \
--to=w_armin@gmx.de \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=pali@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).