aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/misc/thinkpad_acpi.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 22a5f228b55a..9f10b4694eda 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -129,7 +129,7 @@ IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");
129 * ACPI basic handles 129 * ACPI basic handles
130 */ 130 */
131 131
132static acpi_handle root_handle = NULL; 132static acpi_handle root_handle;
133 133
134#define IBM_HANDLE(object, parent, paths...) \ 134#define IBM_HANDLE(object, parent, paths...) \
135 static acpi_handle object##_handle; \ 135 static acpi_handle object##_handle; \
@@ -515,8 +515,8 @@ static char *next_cmd(char **cmds)
515 **************************************************************************** 515 ****************************************************************************
516 ****************************************************************************/ 516 ****************************************************************************/
517 517
518static struct platform_device *tpacpi_pdev = NULL; 518static struct platform_device *tpacpi_pdev;
519static struct class_device *tpacpi_hwmon = NULL; 519static struct class_device *tpacpi_hwmon;
520 520
521static struct platform_driver tpacpi_pdriver = { 521static struct platform_driver tpacpi_pdriver = {
522 .driver = { 522 .driver = {
@@ -729,7 +729,7 @@ static struct ibm_struct thinkpad_acpi_driver_data = {
729static int hotkey_orig_status; 729static int hotkey_orig_status;
730static int hotkey_orig_mask; 730static int hotkey_orig_mask;
731 731
732static struct attribute_set *hotkey_dev_attributes = NULL; 732static struct attribute_set *hotkey_dev_attributes;
733 733
734/* sysfs hotkey enable ------------------------------------------------- */ 734/* sysfs hotkey enable ------------------------------------------------- */
735static ssize_t hotkey_enable_show(struct device *dev, 735static ssize_t hotkey_enable_show(struct device *dev,
@@ -2694,7 +2694,7 @@ static struct ibm_struct ecdump_driver_data = {
2694 * Backlight/brightness subdriver 2694 * Backlight/brightness subdriver
2695 */ 2695 */
2696 2696
2697static struct backlight_device *ibm_backlight_device = NULL; 2697static struct backlight_device *ibm_backlight_device;
2698 2698
2699static struct backlight_ops ibm_backlight_data = { 2699static struct backlight_ops ibm_backlight_data = {
2700 .get_brightness = brightness_get, 2700 .get_brightness = brightness_get,
@@ -3497,7 +3497,7 @@ static void fan_watchdog_fire(struct work_struct *ignored)
3497 3497
3498static void fan_watchdog_reset(void) 3498static void fan_watchdog_reset(void)
3499{ 3499{
3500 static int fan_watchdog_active = 0; 3500 static int fan_watchdog_active;
3501 3501
3502 if (fan_control_access_mode == TPACPI_FAN_WR_NONE) 3502 if (fan_control_access_mode == TPACPI_FAN_WR_NONE)
3503 return; 3503 return;
@@ -3900,7 +3900,7 @@ static struct ibm_struct fan_driver_data = {
3900 ****************************************************************************/ 3900 ****************************************************************************/
3901 3901
3902/* /proc support */ 3902/* /proc support */
3903static struct proc_dir_entry *proc_dir = NULL; 3903static struct proc_dir_entry *proc_dir;
3904 3904
3905/* Subdriver registry */ 3905/* Subdriver registry */
3906static LIST_HEAD(tpacpi_all_drivers); 3906static LIST_HEAD(tpacpi_all_drivers);
@@ -4043,7 +4043,7 @@ static void ibm_exit(struct ibm_struct *ibm)
4043 4043
4044/* Probing */ 4044/* Probing */
4045 4045
4046static char *ibm_thinkpad_ec_found = NULL; 4046static char *ibm_thinkpad_ec_found;
4047 4047
4048static char* __init check_dmi_for_ec(void) 4048static char* __init check_dmi_for_ec(void)
4049{ 4049{