|
@@ -1,5 +1,5 @@
|
|
|
/*
|
|
|
- * acpi_button.c - ACPI Button Driver ($Revision: 30 $)
|
|
|
+ * button.c - ACPI Button Driver
|
|
|
*
|
|
|
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
|
|
|
* 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)
|
|
|
|
|
|
seq_printf(seq, "type: %s\n",
|
|
|
acpi_device_name(button->device));
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -259,6 +258,7 @@ static int acpi_lid_send_state(struct acpi_button *button)
|
|
|
&state);
|
|
|
if (ACPI_FAILURE(status))
|
|
|
return -ENODEV;
|
|
|
+
|
|
|
/* input layer checks if event is redundant */
|
|
|
input_report_switch(button->input, SW_LID, !state);
|
|
|
input_sync(button->input);
|
|
@@ -299,13 +299,12 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
|
|
|
"Unsupported event [0x%x]\n", event));
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
- return;
|
|
|
}
|
|
|
|
|
|
static int acpi_button_resume(struct acpi_device *device)
|
|
|
{
|
|
|
struct acpi_button *button;
|
|
|
+
|
|
|
if (!device)
|
|
|
return -EINVAL;
|
|
|
button = acpi_driver_data(device);
|
|
@@ -424,7 +423,6 @@ static int acpi_button_add(struct acpi_device *device)
|
|
|
|
|
|
printk(KERN_INFO PREFIX "%s [%s]\n",
|
|
|
acpi_device_name(device), acpi_device_bid(device));
|
|
|
-
|
|
|
return 0;
|
|
|
|
|
|
err_remove_fs:
|
|
@@ -448,7 +446,6 @@ static int acpi_button_remove(struct acpi_device *device, int type)
|
|
|
acpi_button_remove_fs(device);
|
|
|
input_unregister_device(button->input);
|
|
|
kfree(button);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -459,6 +456,7 @@ static int __init acpi_button_init(void)
|
|
|
acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
|
|
|
if (!acpi_button_dir)
|
|
|
return -ENODEV;
|
|
|
+
|
|
|
result = acpi_bus_register_driver(&acpi_button_driver);
|
|
|
if (result < 0) {
|
|
|
remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
|