diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2008-04-26 00:02:22 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-04-29 09:47:01 -0400 |
commit | 95e57ab2cbd8b016327b23d76da8a96cbd26ac0c (patch) | |
tree | 22020e4e0228f2730f46919fbcc755ce1ab3a5e5 /drivers/misc/thinkpad_acpi.c | |
parent | e11aecf1379e7c4a0293182096e38e5a336696b2 (diff) |
ACPI: thinkpad-acpi: claim tpacpi as an official short handle (v1.1)
Unfortunately, a lot of stuff in the kernel has size limitations, so
"thinkpad-acpi" ends up eating up too much real estate. We were using
"tpacpi" in symbols already, but this shorthand was not visible to
userland.
Document that the driver will use tpacpi as a short hand where necessary,
and use it to name the kernel thread for NVRAM polling (now named
"ktpacpi_nvramd").
Also, register a module alias with the shorthand. One can refer to the
module using the shorthand name.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/thinkpad_acpi.c')
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 5e25abc54008..2b73dfafac9d 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -133,8 +133,11 @@ enum { | |||
133 | #define TPACPI_PROC_DIR "ibm" | 133 | #define TPACPI_PROC_DIR "ibm" |
134 | #define TPACPI_ACPI_EVENT_PREFIX "ibm" | 134 | #define TPACPI_ACPI_EVENT_PREFIX "ibm" |
135 | #define TPACPI_DRVR_NAME TPACPI_FILE | 135 | #define TPACPI_DRVR_NAME TPACPI_FILE |
136 | #define TPACPI_DRVR_SHORTNAME "tpacpi" | ||
136 | #define TPACPI_HWMON_DRVR_NAME TPACPI_NAME "_hwmon" | 137 | #define TPACPI_HWMON_DRVR_NAME TPACPI_NAME "_hwmon" |
137 | 138 | ||
139 | #define TPACPI_NVRAM_KTHREAD_NAME "ktpacpi_nvramd" | ||
140 | |||
138 | #define TPACPI_MAX_ACPI_ARGS 3 | 141 | #define TPACPI_MAX_ACPI_ARGS 3 |
139 | 142 | ||
140 | /* Debugging */ | 143 | /* Debugging */ |
@@ -1523,8 +1526,7 @@ static void hotkey_poll_setup(int may_warn) | |||
1523 | (tpacpi_inputdev->users > 0 || hotkey_report_mode < 2)) { | 1526 | (tpacpi_inputdev->users > 0 || hotkey_report_mode < 2)) { |
1524 | if (!tpacpi_hotkey_task) { | 1527 | if (!tpacpi_hotkey_task) { |
1525 | tpacpi_hotkey_task = kthread_run(hotkey_kthread, | 1528 | tpacpi_hotkey_task = kthread_run(hotkey_kthread, |
1526 | NULL, | 1529 | NULL, TPACPI_NVRAM_KTHREAD_NAME); |
1527 | TPACPI_FILE "d"); | ||
1528 | if (IS_ERR(tpacpi_hotkey_task)) { | 1530 | if (IS_ERR(tpacpi_hotkey_task)) { |
1529 | tpacpi_hotkey_task = NULL; | 1531 | tpacpi_hotkey_task = NULL; |
1530 | printk(TPACPI_ERR | 1532 | printk(TPACPI_ERR |
@@ -6316,6 +6318,8 @@ static int __init thinkpad_acpi_module_init(void) | |||
6316 | /* Please remove this in year 2009 */ | 6318 | /* Please remove this in year 2009 */ |
6317 | MODULE_ALIAS("ibm_acpi"); | 6319 | MODULE_ALIAS("ibm_acpi"); |
6318 | 6320 | ||
6321 | MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); | ||
6322 | |||
6319 | /* | 6323 | /* |
6320 | * DMI matching for module autoloading | 6324 | * DMI matching for module autoloading |
6321 | * | 6325 | * |