aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/misc/thinkpad_acpi.c55
1 files changed, 4 insertions, 51 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index b6293a40132e..45be8e5f9351 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -26,6 +26,8 @@
26 26
27/* 27/*
28 * Changelog: 28 * Changelog:
29 * 2007-10-20 changelog trimmed down
30 *
29 * 2007-03-27 0.14 renamed to thinkpad_acpi and moved to 31 * 2007-03-27 0.14 renamed to thinkpad_acpi and moved to
30 * drivers/misc. 32 * drivers/misc.
31 * 33 *
@@ -33,53 +35,16 @@
33 * changelog now lives in git commit history, and will 35 * changelog now lives in git commit history, and will
34 * not be updated further in-file. 36 * not be updated further in-file.
35 * 37 *
36 * 2005-08-17 0.12 fix compilation on 2.6.13-rc kernels
37 * 2005-03-17 0.11 support for 600e, 770x 38 * 2005-03-17 0.11 support for 600e, 770x
38 * thanks to Jamie Lentin <lentinj@dial.pipex.com> 39 * thanks to Jamie Lentin <lentinj@dial.pipex.com>
39 * support for 770e, G41 40 *
40 * G40 and G41 don't have a thinklight 41 * 2005-01-16 0.9 use MODULE_VERSION
41 * temperatures no longer experimental
42 * experimental brightness control
43 * experimental volume control
44 * experimental fan enable/disable
45 * 2005-01-16 0.10 fix module loading on R30, R31
46 * 2005-01-16 0.9 support for 570, R30, R31
47 * ultrabay support on A22p, A3x
48 * limit arg for cmos, led, beep, drop experimental status
49 * more capable led control on A21e, A22p, T20-22, X20
50 * experimental temperatures and fan speed
51 * experimental embedded controller register dump
52 * mark more functions as __init, drop incorrect __exit
53 * use MODULE_VERSION
54 * thanks to Henrik Brix Andersen <brix@gentoo.org> 42 * thanks to Henrik Brix Andersen <brix@gentoo.org>
55 * fix parameter passing on module loading 43 * fix parameter passing on module loading
56 * thanks to Rusty Russell <rusty@rustcorp.com.au> 44 * thanks to Rusty Russell <rusty@rustcorp.com.au>
57 * thanks to Jim Radford <radford@blackbean.org> 45 * thanks to Jim Radford <radford@blackbean.org>
58 * 2004-11-08 0.8 fix init error case, don't return from a macro 46 * 2004-11-08 0.8 fix init error case, don't return from a macro
59 * thanks to Chris Wright <chrisw@osdl.org> 47 * thanks to Chris Wright <chrisw@osdl.org>
60 * 2004-10-23 0.7 fix module loading on A21e, A22p, T20, T21, X20
61 * fix led control on A21e
62 * 2004-10-19 0.6 use acpi_bus_register_driver() to claim HKEY device
63 * 2004-10-18 0.5 thinklight support on A21e, G40, R32, T20, T21, X20
64 * proc file format changed
65 * video_switch command
66 * experimental cmos control
67 * experimental led control
68 * experimental acpi sounds
69 * 2004-09-16 0.4 support for module parameters
70 * hotkey mask can be prefixed by 0x
71 * video output switching
72 * video expansion control
73 * ultrabay eject support
74 * removed lcd brightness/on/off control, didn't work
75 * 2004-08-17 0.3 support for R40
76 * lcd off, brightness control
77 * thinklight on/off
78 * 2004-08-14 0.2 support for T series, X20
79 * bluetooth enable/disable
80 * hotkey events disabled by default
81 * removed fan control, currently useless
82 * 2004-08-09 0.1 initial release, support for X series
83 */ 48 */
84 49
85#include <linux/kernel.h> 50#include <linux/kernel.h>
@@ -314,8 +279,6 @@ struct thinkpad_id_data {
314}; 279};
315static struct thinkpad_id_data thinkpad_id; 280static struct thinkpad_id_data thinkpad_id;
316 281
317#define __unused __attribute__ ((unused))
318
319static enum { 282static enum {
320 TPACPI_LIFE_INIT = 0, 283 TPACPI_LIFE_INIT = 0,
321 TPACPI_LIFE_RUNNING, 284 TPACPI_LIFE_RUNNING,
@@ -451,16 +414,6 @@ static int acpi_evalf(acpi_handle handle,
451 return success; 414 return success;
452} 415}
453 416
454static void __unused acpi_print_int(acpi_handle handle, char *method)
455{
456 int i;
457
458 if (acpi_evalf(handle, &i, method, "d"))
459 printk(IBM_INFO "%s = 0x%x\n", method, i);
460 else
461 printk(IBM_ERR "error calling %s\n", method);
462}
463
464static int acpi_ec_read(int i, u8 * p) 417static int acpi_ec_read(int i, u8 * p)
465{ 418{
466 int v; 419 int v;