aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-04-21 10:08:27 -0400
committerLen Brown <len.brown@intel.com>2007-04-21 23:30:33 -0400
commit1def7115f0277ce9d2a54efd0ae187aa88d5c7fa (patch)
treed32c315dc38a040fc8f4b2bc27fe0c16c39c78c7
parent142cfc90f026b0b8fd1a14ba11ae29eb7b1b6ca1 (diff)
ACPI: thinkpad-acpi: rename module glue
Rename module init and exit functions, now that we are not called ibm-acpi anymore. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/misc/thinkpad_acpi.c12
-rw-r--r--drivers/misc/thinkpad_acpi.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 4b434866007e..80ef195c9581 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -2707,7 +2707,7 @@ IBM_PARAM(brightness);
2707IBM_PARAM(volume); 2707IBM_PARAM(volume);
2708IBM_PARAM(fan); 2708IBM_PARAM(fan);
2709 2709
2710static int __init acpi_ibm_init(void) 2710static int __init thinkpad_acpi_module_init(void)
2711{ 2711{
2712 int ret, i; 2712 int ret, i;
2713 2713
@@ -2754,7 +2754,7 @@ static int __init acpi_ibm_init(void)
2754 proc_dir = proc_mkdir(IBM_DIR, acpi_root_dir); 2754 proc_dir = proc_mkdir(IBM_DIR, acpi_root_dir);
2755 if (!proc_dir) { 2755 if (!proc_dir) {
2756 printk(IBM_ERR "unable to create proc dir %s", IBM_DIR); 2756 printk(IBM_ERR "unable to create proc dir %s", IBM_DIR);
2757 acpi_ibm_exit(); 2757 thinkpad_acpi_module_exit();
2758 return -ENODEV; 2758 return -ENODEV;
2759 } 2759 }
2760 proc_dir->owner = THIS_MODULE; 2760 proc_dir->owner = THIS_MODULE;
@@ -2764,7 +2764,7 @@ static int __init acpi_ibm_init(void)
2764 if (ret >= 0 && *ibms[i].param) 2764 if (ret >= 0 && *ibms[i].param)
2765 ret = ibms[i].write(ibms[i].param); 2765 ret = ibms[i].write(ibms[i].param);
2766 if (ret < 0) { 2766 if (ret < 0) {
2767 acpi_ibm_exit(); 2767 thinkpad_acpi_module_exit();
2768 return ret; 2768 return ret;
2769 } 2769 }
2770 } 2770 }
@@ -2772,7 +2772,7 @@ static int __init acpi_ibm_init(void)
2772 return 0; 2772 return 0;
2773} 2773}
2774 2774
2775static void acpi_ibm_exit(void) 2775static void thinkpad_acpi_module_exit(void)
2776{ 2776{
2777 int i; 2777 int i;
2778 2778
@@ -2786,5 +2786,5 @@ static void acpi_ibm_exit(void)
2786 kfree(ibm_thinkpad_ec_found); 2786 kfree(ibm_thinkpad_ec_found);
2787} 2787}
2788 2788
2789module_init(acpi_ibm_init); 2789module_init(thinkpad_acpi_module_init);
2790module_exit(acpi_ibm_exit); 2790module_exit(thinkpad_acpi_module_exit);
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index b86e5740aba4..8b2fd1a1a8a1 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -115,8 +115,8 @@ static int experimental;
115static char *ibm_thinkpad_ec_found; 115static char *ibm_thinkpad_ec_found;
116 116
117static char* check_dmi_for_ec(void); 117static char* check_dmi_for_ec(void);
118static int acpi_ibm_init(void); 118static int thinkpad_acpi_module_init(void);
119static void acpi_ibm_exit(void); 119static void thinkpad_acpi_module_exit(void);
120 120
121 121
122/**************************************************************************** 122/****************************************************************************