Skip to content

Commit

Permalink
ACPI: button: Use acpi_device's handle instead of driver's
Browse files Browse the repository at this point in the history
Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Patrick Mochel authored and Len Brown committed Jun 30, 2006
1 parent 3b073ec commit 27b1d3e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/acpi/button.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
if (!button || !button->device)
return 0;

status = acpi_evaluate_integer(button->handle, "_LID", NULL, &state);
status = acpi_evaluate_integer(button->device->handle, "_LID", NULL, &state);
if (ACPI_FAILURE(status)) {
seq_printf(seq, "state: unsupported\n");
} else {
Expand Down Expand Up @@ -282,7 +282,7 @@ static acpi_status acpi_button_notify_fixed(void *data)
if (!button)
return AE_BAD_PARAMETER;

acpi_button_notify(button->handle, ACPI_BUTTON_NOTIFY_STATUS, button);
acpi_button_notify(button->device->handle, ACPI_BUTTON_NOTIFY_STATUS, button);

return AE_OK;
}
Expand Down Expand Up @@ -362,7 +362,7 @@ static int acpi_button_add(struct acpi_device *device)
button);
break;
default:
status = acpi_install_notify_handler(button->handle,
status = acpi_install_notify_handler(device->handle,
ACPI_DEVICE_NOTIFY,
acpi_button_notify,
button);
Expand Down Expand Up @@ -420,7 +420,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
acpi_button_notify_fixed);
break;
default:
status = acpi_remove_notify_handler(button->handle,
status = acpi_remove_notify_handler(device->handle,
ACPI_DEVICE_NOTIFY,
acpi_button_notify);
break;
Expand Down

0 comments on commit 27b1d3e

Please sign in to comment.