aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Mochel <mochel@linux.intel.com>2006-05-19 16:54:42 -0400
committerLen Brown <len.brown@intel.com>2006-06-30 02:42:05 -0400
commit27b1d3e85b1dfd9037d3fbb98b2e2aacca01da39 (patch)
tree338d2460b16dae031f169b827388f86be449845a
parent3b073ec3667ee63e35b66752a30eeedef1e1e772 (diff)
ACPI: button: Use acpi_device's handle instead of driver's
Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/button.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 02594639c4d9..eefb9e4df580 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -137,7 +137,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
137 if (!button || !button->device) 137 if (!button || !button->device)
138 return 0; 138 return 0;
139 139
140 status = acpi_evaluate_integer(button->handle, "_LID", NULL, &state); 140 status = acpi_evaluate_integer(button->device->handle, "_LID", NULL, &state);
141 if (ACPI_FAILURE(status)) { 141 if (ACPI_FAILURE(status)) {
142 seq_printf(seq, "state: unsupported\n"); 142 seq_printf(seq, "state: unsupported\n");
143 } else { 143 } else {
@@ -282,7 +282,7 @@ static acpi_status acpi_button_notify_fixed(void *data)
282 if (!button) 282 if (!button)
283 return AE_BAD_PARAMETER; 283 return AE_BAD_PARAMETER;
284 284
285 acpi_button_notify(button->handle, ACPI_BUTTON_NOTIFY_STATUS, button); 285 acpi_button_notify(button->device->handle, ACPI_BUTTON_NOTIFY_STATUS, button);
286 286
287 return AE_OK; 287 return AE_OK;
288} 288}
@@ -362,7 +362,7 @@ static int acpi_button_add(struct acpi_device *device)
362 button); 362 button);
363 break; 363 break;
364 default: 364 default:
365 status = acpi_install_notify_handler(button->handle, 365 status = acpi_install_notify_handler(device->handle,
366 ACPI_DEVICE_NOTIFY, 366 ACPI_DEVICE_NOTIFY,
367 acpi_button_notify, 367 acpi_button_notify,
368 button); 368 button);
@@ -420,7 +420,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
420 acpi_button_notify_fixed); 420 acpi_button_notify_fixed);
421 break; 421 break;
422 default: 422 default:
423 status = acpi_remove_notify_handler(button->handle, 423 status = acpi_remove_notify_handler(device->handle,
424 ACPI_DEVICE_NOTIFY, 424 ACPI_DEVICE_NOTIFY,
425 acpi_button_notify); 425 acpi_button_notify);
426 break; 426 break;