aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/button.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index d73c94b8441d..52eb06ea4f80 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * acpi_button.c - ACPI Button Driver ($Revision: 30 $) 2 * button.c - ACPI Button Driver
3 * 3 *
4 * Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com> 4 * Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
5 * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> 5 * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -133,7 +133,6 @@ static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)
133 133
134 seq_printf(seq, "type: %s\n", 134 seq_printf(seq, "type: %s\n",
135 acpi_device_name(button->device)); 135 acpi_device_name(button->device));
136
137 return 0; 136 return 0;
138} 137}
139 138
@@ -259,6 +258,7 @@ static int acpi_lid_send_state(struct acpi_button *button)
259 &state); 258 &state);
260 if (ACPI_FAILURE(status)) 259 if (ACPI_FAILURE(status))
261 return -ENODEV; 260 return -ENODEV;
261
262 /* input layer checks if event is redundant */ 262 /* input layer checks if event is redundant */
263 input_report_switch(button->input, SW_LID, !state); 263 input_report_switch(button->input, SW_LID, !state);
264 input_sync(button->input); 264 input_sync(button->input);
@@ -299,13 +299,12 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
299 "Unsupported event [0x%x]\n", event)); 299 "Unsupported event [0x%x]\n", event));
300 break; 300 break;
301 } 301 }
302
303 return;
304} 302}
305 303
306static int acpi_button_resume(struct acpi_device *device) 304static int acpi_button_resume(struct acpi_device *device)
307{ 305{
308 struct acpi_button *button; 306 struct acpi_button *button;
307
309 if (!device) 308 if (!device)
310 return -EINVAL; 309 return -EINVAL;
311 button = acpi_driver_data(device); 310 button = acpi_driver_data(device);
@@ -424,7 +423,6 @@ static int acpi_button_add(struct acpi_device *device)
424 423
425 printk(KERN_INFO PREFIX "%s [%s]\n", 424 printk(KERN_INFO PREFIX "%s [%s]\n",
426 acpi_device_name(device), acpi_device_bid(device)); 425 acpi_device_name(device), acpi_device_bid(device));
427
428 return 0; 426 return 0;
429 427
430 err_remove_fs: 428 err_remove_fs:
@@ -448,7 +446,6 @@ static int acpi_button_remove(struct acpi_device *device, int type)
448 acpi_button_remove_fs(device); 446 acpi_button_remove_fs(device);
449 input_unregister_device(button->input); 447 input_unregister_device(button->input);
450 kfree(button); 448 kfree(button);
451
452 return 0; 449 return 0;
453} 450}
454 451
@@ -459,6 +456,7 @@ static int __init acpi_button_init(void)
459 acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir); 456 acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
460 if (!acpi_button_dir) 457 if (!acpi_button_dir)
461 return -ENODEV; 458 return -ENODEV;
459
462 result = acpi_bus_register_driver(&acpi_button_driver); 460 result = acpi_bus_register_driver(&acpi_button_driver);
463 if (result < 0) { 461 if (result < 0) {
464 remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir); 462 remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);