[POWERPC] Add MPC8349E MDS device tree source file to arch/powerpc/boot/dts

[powerpc.git] / drivers / acpi / button.c

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 0259463..5ef885e 100644 (file)
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -82,20 +82,19 @@ static struct acpi_driver acpi_button_driver = {
 };
 
 struct acpi_button {
-       acpi_handle handle;
        struct acpi_device *device;     /* Fixed button kludge */
        u8 type;
        unsigned long pushed;
 };
 
-static struct file_operations acpi_button_info_fops = {
+static const struct file_operations acpi_button_info_fops = {
        .open = acpi_button_info_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
        .release = single_release,
 };
 
-static struct file_operations acpi_button_state_fops = {
+static const struct file_operations acpi_button_state_fops = {
        .open = acpi_button_state_open_fs,
        .read = seq_read,
        .llseek = seq_lseek,
@@ -137,7 +136,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 {
@@ -282,7 +281,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;
 }
@@ -303,7 +302,6 @@ static int acpi_button_add(struct acpi_device *device)
        memset(button, 0, sizeof(struct acpi_button));
 
        button->device = device;
-       button->handle = device->handle;
        acpi_driver_data(device) = button;
 
        /*
@@ -362,7 +360,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);
@@ -420,7 +418,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;