diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2007-03-29 00:58:43 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-03-30 15:35:42 -0400 |
commit | 643f12dbb660e139fbaea268f3e3ce4d7d594b8f (patch) | |
tree | 2adeddea6d1a1733da9ad39befc0ec40fdeee1e3 /drivers/misc/thinkpad_acpi.c | |
parent | d903ac5455102b13d0e28d6a39f640175fb4cd4d (diff) |
ACPI: thinkpad-acpi: cleanup after rename
Cleanup documentation, driver strings and other misc stuff, now that the
driver is named "thinkpad-acpi".
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 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 90ffc4670a01..ddaedf80d873 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * ibm_acpi.c - IBM ThinkPad ACPI Extras | 2 | * thinkpad_acpi.c - ThinkPad ACPI Extras |
3 | * | 3 | * |
4 | * | 4 | * |
5 | * Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net> | 5 | * Copyright (C) 2004-2005 Borislav Deianov <borislav@users.sf.net> |
@@ -21,10 +21,12 @@ | |||
21 | * 02110-1301, USA. | 21 | * 02110-1301, USA. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define IBM_VERSION "0.13" | 24 | #define IBM_VERSION "0.14" |
25 | 25 | ||
26 | /* | 26 | /* |
27 | * Changelog: | 27 | * Changelog: |
28 | * 2007-03-27 0.14 renamed to thinkpad_acpi and moved to | ||
29 | * drivers/misc. | ||
28 | * | 30 | * |
29 | * 2006-11-22 0.13 new maintainer | 31 | * 2006-11-22 0.13 new maintainer |
30 | * changelog now lives in git commit history, and will | 32 | * changelog now lives in git commit history, and will |
@@ -318,7 +320,9 @@ static int __init setup_notify(struct ibm_struct *ibm) | |||
318 | } | 320 | } |
319 | 321 | ||
320 | acpi_driver_data(ibm->device) = ibm; | 322 | acpi_driver_data(ibm->device) = ibm; |
321 | sprintf(acpi_device_class(ibm->device), "%s/%s", IBM_NAME, ibm->name); | 323 | sprintf(acpi_device_class(ibm->device), "%s/%s", |
324 | IBM_ACPI_EVENT_PREFIX, | ||
325 | ibm->name); | ||
322 | 326 | ||
323 | status = acpi_install_notify_handler(*ibm->handle, ibm->type, | 327 | status = acpi_install_notify_handler(*ibm->handle, ibm->type, |
324 | dispatch_notify, ibm); | 328 | dispatch_notify, ibm); |
@@ -458,7 +462,7 @@ static char *next_cmd(char **cmds) | |||
458 | * ibm-acpi init subdriver | 462 | * ibm-acpi init subdriver |
459 | */ | 463 | */ |
460 | 464 | ||
461 | static int ibm_acpi_driver_init(void) | 465 | static int thinkpad_acpi_driver_init(void) |
462 | { | 466 | { |
463 | printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION); | 467 | printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION); |
464 | printk(IBM_INFO "%s\n", IBM_URL); | 468 | printk(IBM_INFO "%s\n", IBM_URL); |
@@ -470,7 +474,7 @@ static int ibm_acpi_driver_init(void) | |||
470 | return 0; | 474 | return 0; |
471 | } | 475 | } |
472 | 476 | ||
473 | static int ibm_acpi_driver_read(char *p) | 477 | static int thinkpad_acpi_driver_read(char *p) |
474 | { | 478 | { |
475 | int len = 0; | 479 | int len = 0; |
476 | 480 | ||
@@ -2440,8 +2444,8 @@ static struct proc_dir_entry *proc_dir = NULL; | |||
2440 | static struct ibm_struct ibms[] = { | 2444 | static struct ibm_struct ibms[] = { |
2441 | { | 2445 | { |
2442 | .name = "driver", | 2446 | .name = "driver", |
2443 | .init = ibm_acpi_driver_init, | 2447 | .init = thinkpad_acpi_driver_init, |
2444 | .read = ibm_acpi_driver_read, | 2448 | .read = thinkpad_acpi_driver_read, |
2445 | }, | 2449 | }, |
2446 | { | 2450 | { |
2447 | .name = "hotkey", | 2451 | .name = "hotkey", |