When ACPI_PROCFS is disabled, /proc/acpi/fan/ directory is not created.
So, it should not be removed during the module removal either.
Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>
---
drivers/acpi/fan.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index acf2ab2..d92c035 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -355,12 +355,13 @@ static int __init acpi_fan_init(void)
#endif
result = acpi_bus_register_driver(&acpi_fan_driver);
- if (result < 0) {
+
+#ifdef CONFIG_ACPI_PROCFS
+ if (result < 0)
remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);
- return -ENODEV;
- }
+#endif
- return 0;
+ return result;
}
static void __exit acpi_fan_exit(void)
@@ -368,7 +369,9 @@ static void __exit acpi_fan_exit(void)
acpi_bus_unregister_driver(&acpi_fan_driver);
+#ifdef CONFIG_ACPI_PROCFS
remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);
+#endif
return;
}
--
1.6.6.1
> When ACPI_PROCFS is disabled, /proc/acpi/fan/ directory is not created.
> So, it should not be removed during the module removal either.
Yes, this patch would make the #ifdefs consistent.
But it looks like remove_proc_entry() just silently does nothing
if the directory is not there, yes?
What I'd really like to see is a patch removing fan.c's proc code
completely. It was scheduld for removal in July 2008.
thanks,
Len Brown, Intel Open Source Technology Center
On Tue, Apr 27, 2010 at 01:12:49PM -0400, Len Brown wrote:
> > When ACPI_PROCFS is disabled, /proc/acpi/fan/ directory is not created.
> > So, it should not be removed during the module removal either.
>
> Yes, this patch would make the #ifdefs consistent.
> But it looks like remove_proc_entry() just silently does nothing
> if the directory is not there, yes?
>
No, I get a WARNING right now. That's why I hit the problem, I've just
randomly removed fan.
> What I'd really like to see is a patch removing fan.c's proc code
> completely. It was scheduld for removal in July 2008.
>
Well, no config for "old fan /proc files"? Simply drop it? If that's OK,
I'll gladly submit another patch.
> thanks,
> Len Brown, Intel Open Source Technology Center