Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / acpi / button.c

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 4b6d9f0..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,
@@ -112,15 +111,14 @@ static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_button *button = (struct acpi_button *)seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_button_info_seq_show");
 
        if (!button || !button->device)
-               return_VALUE(0);
+               return 0;
 
        seq_printf(seq, "type:                    %s\n",
                   acpi_device_name(button->device));
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_button_info_open_fs(struct inode *inode, struct file *file)
@@ -134,12 +132,11 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
        acpi_status status;
        unsigned long state;
 
-       ACPI_FUNCTION_TRACE("acpi_button_state_seq_show");
 
        if (!button || !button->device)
-               return_VALUE(0);
+               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 {
@@ -147,7 +144,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
                           (state ? "open" : "closed"));
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_button_state_open_fs(struct inode *inode, struct file *file)
@@ -164,10 +161,9 @@ static int acpi_button_add_fs(struct acpi_device *device)
        struct proc_dir_entry *entry = NULL;
        struct acpi_button *button = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_button_add_fs");
 
        if (!device || !acpi_driver_data(device))
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        button = acpi_driver_data(device);
 
@@ -195,21 +191,19 @@ static int acpi_button_add_fs(struct acpi_device *device)
        }
 
        if (!entry)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        entry->owner = THIS_MODULE;
 
        acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), entry);
        if (!acpi_device_dir(device))
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        acpi_device_dir(device)->owner = THIS_MODULE;
 
        /* 'info' [R] */
        entry = create_proc_entry(ACPI_BUTTON_FILE_INFO,
                                  S_IRUGO, acpi_device_dir(device));
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Unable to create '%s' fs entry\n",
-                                 ACPI_BUTTON_FILE_INFO));
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_button_info_fops;
                entry->data = acpi_driver_data(device);
@@ -221,9 +215,7 @@ static int acpi_button_add_fs(struct acpi_device *device)
                entry = create_proc_entry(ACPI_BUTTON_FILE_STATE,
                                          S_IRUGO, acpi_device_dir(device));
                if (!entry)
-                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                         "Unable to create '%s' fs entry\n",
-                                         ACPI_BUTTON_FILE_INFO));
+                       return -ENODEV;
                else {
                        entry->proc_fops = &acpi_button_state_fops;
                        entry->data = acpi_driver_data(device);
@@ -231,14 +223,13 @@ static int acpi_button_add_fs(struct acpi_device *device)
                }
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_button_remove_fs(struct acpi_device *device)
 {
        struct acpi_button *button = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_button_remove_fs");
 
        button = acpi_driver_data(device);
        if (acpi_device_dir(device)) {
@@ -253,7 +244,7 @@ static int acpi_button_remove_fs(struct acpi_device *device)
                acpi_device_dir(device) = NULL;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 /* --------------------------------------------------------------------------
@@ -264,10 +255,9 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
 {
        struct acpi_button *button = (struct acpi_button *)data;
 
-       ACPI_FUNCTION_TRACE("acpi_button_notify");
 
        if (!button || !button->device)
-               return_VOID;
+               return;
 
        switch (event) {
        case ACPI_BUTTON_NOTIFY_STATUS:
@@ -280,21 +270,20 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
                break;
        }
 
-       return_VOID;
+       return;
 }
 
 static acpi_status acpi_button_notify_fixed(void *data)
 {
        struct acpi_button *button = (struct acpi_button *)data;
 
-       ACPI_FUNCTION_TRACE("acpi_button_notify_fixed");
 
        if (!button)
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               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_ACPI_STATUS(AE_OK);
+       return AE_OK;
 }
 
 static int acpi_button_add(struct acpi_device *device)
@@ -303,18 +292,16 @@ static int acpi_button_add(struct acpi_device *device)
        acpi_status status = AE_OK;
        struct acpi_button *button = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_button_add");
 
        if (!device)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        button = kmalloc(sizeof(struct acpi_button), GFP_KERNEL);
        if (!button)
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
        memset(button, 0, sizeof(struct acpi_button));
 
        button->device = device;
-       button->handle = device->handle;
        acpi_driver_data(device) = button;
 
        /*
@@ -349,8 +336,8 @@ static int acpi_button_add(struct acpi_device *device)
                sprintf(acpi_device_class(device), "%s/%s",
                        ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID);
        } else {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unsupported hid [%s]\n",
-                                 acpi_device_hid(device)));
+               printk(KERN_ERR PREFIX "Unsupported hid [%s]\n",
+                           acpi_device_hid(device));
                result = -ENODEV;
                goto end;
        }
@@ -373,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);
@@ -381,8 +368,6 @@ static int acpi_button_add(struct acpi_device *device)
        }
 
        if (ACPI_FAILURE(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Error installing notify handler\n"));
                result = -ENODEV;
                goto end;
        }
@@ -406,7 +391,7 @@ static int acpi_button_add(struct acpi_device *device)
                kfree(button);
        }
 
-       return_VALUE(result);
+       return result;
 }
 
 static int acpi_button_remove(struct acpi_device *device, int type)
@@ -414,10 +399,9 @@ static int acpi_button_remove(struct acpi_device *device, int type)
        acpi_status status = 0;
        struct acpi_button *button = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_button_remove");
 
        if (!device || !acpi_driver_data(device))
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        button = acpi_driver_data(device);
 
@@ -434,45 +418,39 @@ 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;
        }
 
-       if (ACPI_FAILURE(status))
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Error removing notify handler\n"));
-
        acpi_button_remove_fs(device);
 
        kfree(button);
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int __init acpi_button_init(void)
 {
        int result = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_button_init");
 
        acpi_button_dir = proc_mkdir(ACPI_BUTTON_CLASS, acpi_root_dir);
        if (!acpi_button_dir)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        acpi_button_dir->owner = THIS_MODULE;
        result = acpi_bus_register_driver(&acpi_button_driver);
        if (result < 0) {
                remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 static void __exit acpi_button_exit(void)
 {
-       ACPI_FUNCTION_TRACE("acpi_button_exit");
 
        acpi_bus_unregister_driver(&acpi_button_driver);
 
@@ -484,7 +462,7 @@ static void __exit acpi_button_exit(void)
                remove_proc_entry(ACPI_BUTTON_SUBCLASS_LID, acpi_button_dir);
        remove_proc_entry(ACPI_BUTTON_CLASS, acpi_root_dir);
 
-       return_VOID;
+       return;
 }
 
 module_init(acpi_button_init);