This patch fixes the following:
- acpi_pcc_hotkey_add: although the function prototype was marked
__devinit, the actual function wasn't
- acpi_pcc_proc_init is called by acpi_pcc_hotkey_remove and
therefore has to be __devinit
- acpi_pcc_hotkey_remove: although the function prototype was marked
__devexit, the actual function wasn't
- acpi_pcc_remove_device is called by acpi_pcc_hotkey_remove and
therefore has to be __devexit
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
drivers/acpi/pcc_acpi.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
--- linux-2.6.11-rc5-mm1-full/drivers/acpi/pcc_acpi.c.old 2005-03-02
10:57:35.000000000 +0100
+++ linux-2.6.11-rc5-mm1-full/drivers/acpi/pcc_acpi.c 2005-03-02
11:04:11.000000000 +0100
@@ -643,9 +643,9 @@
{ NULL, NULL, 0 },
};
-static int __init acpi_pcc_add_device(struct acpi_device *device,
- ProcItem *proc_items,
- int num)
+static int __devinit acpi_pcc_add_device(struct acpi_device *device,
+ ProcItem *proc_items,
+ int num)
{
struct acpi_hotkey *hotkey = \
(struct acpi_hotkey*)acpi_driver_data(device);
@@ -675,7 +675,7 @@
return 0;
}
-static int __init acpi_pcc_proc_init(struct acpi_device *device)
+static int __devinit acpi_pcc_proc_init(struct acpi_device *device)
{
acpi_status status;
struct acpi_hotkey *hotkey = \
@@ -707,9 +707,9 @@
return status;
}
-static void __exit acpi_pcc_remove_device(struct acpi_device *device,
- ProcItem *proc_items,
- int num)
+static void __devexit acpi_pcc_remove_device(struct acpi_device *device,
+ ProcItem *proc_items,
+ int num)
{
struct acpi_hotkey *hotkey =
(struct acpi_hotkey*)acpi_driver_data(device);
@@ -791,7 +791,7 @@
}
/* module init */
-static int acpi_pcc_hotkey_add (struct acpi_device *device)
+static int __devinit acpi_pcc_hotkey_add (struct acpi_device *device)
{
acpi_status status;
struct acpi_hotkey *hotkey = NULL;
@@ -851,7 +851,8 @@
return acpi_pcc_proc_init(device);
}
-static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type)
+static int __devexit acpi_pcc_hotkey_remove(struct acpi_device *device,
+ int type)
{
acpi_status status;
struct acpi_hotkey *hotkey = acpi_driver_data(device);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
