Commit 1def7115 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown

ACPI: thinkpad-acpi: rename module glue

Rename module init and exit functions, now that we are not called ibm-acpi
anymore.
Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 142cfc90
...@@ -2707,7 +2707,7 @@ IBM_PARAM(brightness); ...@@ -2707,7 +2707,7 @@ IBM_PARAM(brightness);
IBM_PARAM(volume); IBM_PARAM(volume);
IBM_PARAM(fan); IBM_PARAM(fan);
static int __init acpi_ibm_init(void) static int __init thinkpad_acpi_module_init(void)
{ {
int ret, i; int ret, i;
...@@ -2754,7 +2754,7 @@ static int __init acpi_ibm_init(void) ...@@ -2754,7 +2754,7 @@ static int __init acpi_ibm_init(void)
proc_dir = proc_mkdir(IBM_DIR, acpi_root_dir); proc_dir = proc_mkdir(IBM_DIR, acpi_root_dir);
if (!proc_dir) { if (!proc_dir) {
printk(IBM_ERR "unable to create proc dir %s", IBM_DIR); printk(IBM_ERR "unable to create proc dir %s", IBM_DIR);
acpi_ibm_exit(); thinkpad_acpi_module_exit();
return -ENODEV; return -ENODEV;
} }
proc_dir->owner = THIS_MODULE; proc_dir->owner = THIS_MODULE;
...@@ -2764,7 +2764,7 @@ static int __init acpi_ibm_init(void) ...@@ -2764,7 +2764,7 @@ static int __init acpi_ibm_init(void)
if (ret >= 0 && *ibms[i].param) if (ret >= 0 && *ibms[i].param)
ret = ibms[i].write(ibms[i].param); ret = ibms[i].write(ibms[i].param);
if (ret < 0) { if (ret < 0) {
acpi_ibm_exit(); thinkpad_acpi_module_exit();
return ret; return ret;
} }
} }
...@@ -2772,7 +2772,7 @@ static int __init acpi_ibm_init(void) ...@@ -2772,7 +2772,7 @@ static int __init acpi_ibm_init(void)
return 0; return 0;
} }
static void acpi_ibm_exit(void) static void thinkpad_acpi_module_exit(void)
{ {
int i; int i;
...@@ -2786,5 +2786,5 @@ static void acpi_ibm_exit(void) ...@@ -2786,5 +2786,5 @@ static void acpi_ibm_exit(void)
kfree(ibm_thinkpad_ec_found); kfree(ibm_thinkpad_ec_found);
} }
module_init(acpi_ibm_init); module_init(thinkpad_acpi_module_init);
module_exit(acpi_ibm_exit); module_exit(thinkpad_acpi_module_exit);
...@@ -115,8 +115,8 @@ static int experimental; ...@@ -115,8 +115,8 @@ static int experimental;
static char *ibm_thinkpad_ec_found; static char *ibm_thinkpad_ec_found;
static char* check_dmi_for_ec(void); static char* check_dmi_for_ec(void);
static int acpi_ibm_init(void); static int thinkpad_acpi_module_init(void);
static void acpi_ibm_exit(void); static void thinkpad_acpi_module_exit(void);
/**************************************************************************** /****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment