* [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
@ 2021-11-12 17:14 Armin Wolf
2021-11-12 17:49 ` Pali Rohár
2021-11-14 16:52 ` Guenter Roeck
0 siblings, 2 replies; 3+ messages in thread
From: Armin Wolf @ 2021-11-12 17:14 UTC (permalink / raw)
To: pali; +Cc: jdelvare, linux, linux-hwmon, linux-kernel
The removal function is called regardless of whether
/proc/i8k was created successfully or not, the later
causing a WARN() on module removal.
Fix that by only registering the removal function
if /proc/i8k was created successfully.
Tested on a Inspiron 3505.
Fixes: 039ae58503f3 ("hwmon: Allow to compile dell-smm-hwmon driver without /proc/i8k")
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
drivers/hwmon/dell-smm-hwmon.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
index eaace478f508..5596c211f38d 100644
--- a/drivers/hwmon/dell-smm-hwmon.c
+++ b/drivers/hwmon/dell-smm-hwmon.c
@@ -627,10 +627,9 @@ static void __init i8k_init_procfs(struct device *dev)
{
struct dell_smm_data *data = dev_get_drvdata(dev);
- /* Register the proc entry */
- proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data);
-
- devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
+ /* Only register exit function if creation was successful */
+ if (proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data))
+ devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
}
#else
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
2021-11-12 17:14 [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error Armin Wolf
@ 2021-11-12 17:49 ` Pali Rohár
2021-11-14 16:52 ` Guenter Roeck
1 sibling, 0 replies; 3+ messages in thread
From: Pali Rohár @ 2021-11-12 17:49 UTC (permalink / raw)
To: Armin Wolf; +Cc: jdelvare, linux, linux-hwmon, linux-kernel
On Friday 12 November 2021 18:14:40 Armin Wolf wrote:
> The removal function is called regardless of whether
> /proc/i8k was created successfully or not, the later
> causing a WARN() on module removal.
> Fix that by only registering the removal function
> if /proc/i8k was created successfully.
>
> Tested on a Inspiron 3505.
>
> Fixes: 039ae58503f3 ("hwmon: Allow to compile dell-smm-hwmon driver without /proc/i8k")
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Acked-by: Pali Rohár <pali@kernel.org>
> ---
> drivers/hwmon/dell-smm-hwmon.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
> index eaace478f508..5596c211f38d 100644
> --- a/drivers/hwmon/dell-smm-hwmon.c
> +++ b/drivers/hwmon/dell-smm-hwmon.c
> @@ -627,10 +627,9 @@ static void __init i8k_init_procfs(struct device *dev)
> {
> struct dell_smm_data *data = dev_get_drvdata(dev);
>
> - /* Register the proc entry */
> - proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data);
> -
> - devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
> + /* Only register exit function if creation was successful */
> + if (proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data))
> + devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
> }
>
> #else
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
2021-11-12 17:14 [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error Armin Wolf
2021-11-12 17:49 ` Pali Rohár
@ 2021-11-14 16:52 ` Guenter Roeck
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2021-11-14 16:52 UTC (permalink / raw)
To: Armin Wolf; +Cc: pali, jdelvare, linux-hwmon, linux-kernel
On Fri, Nov 12, 2021 at 06:14:40PM +0100, Armin Wolf wrote:
> The removal function is called regardless of whether
> /proc/i8k was created successfully or not, the later
> causing a WARN() on module removal.
> Fix that by only registering the removal function
> if /proc/i8k was created successfully.
>
> Tested on a Inspiron 3505.
>
> Fixes: 039ae58503f3 ("hwmon: Allow to compile dell-smm-hwmon driver without /proc/i8k")
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> Acked-by: Pali Rohár <pali@kernel.org>
Applied.
Thanks,
Guenter
> ---
> drivers/hwmon/dell-smm-hwmon.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> --
> 2.30.2
>
> diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c
> index eaace478f508..5596c211f38d 100644
> --- a/drivers/hwmon/dell-smm-hwmon.c
> +++ b/drivers/hwmon/dell-smm-hwmon.c
> @@ -627,10 +627,9 @@ static void __init i8k_init_procfs(struct device *dev)
> {
> struct dell_smm_data *data = dev_get_drvdata(dev);
>
> - /* Register the proc entry */
> - proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data);
> -
> - devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
> + /* Only register exit function if creation was successful */
> + if (proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data))
> + devm_add_action_or_reset(dev, i8k_exit_procfs, NULL);
> }
>
> #else
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-14 16:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-12 17:14 [PATCH] hwmon: (dell-smm) Fix warning on /proc/i8k creation error Armin Wolf
2021-11-12 17:49 ` Pali Rohár
2021-11-14 16:52 ` Guenter Roeck
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).