1 files changed, 73 insertions, 98 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 702e857e98c5..9810e2a55d0a 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -59,6 +59,9 @@ ACPI_MODULE_NAME("acpi_battery")
 MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);
 MODULE_LICENSE("GPL");
 
+extern struct proc_dir_entry *acpi_lock_battery_dir(void);
+extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
+
 static int acpi_battery_add(struct acpi_device *device);
 static int acpi_battery_remove(struct acpi_device *device, int type);
 
@@ -108,7 +111,7 @@ struct acpi_battery_trips {
 };
 
 struct acpi_battery {
-        acpi_handle handle;
+        struct acpi_device * device;
         struct acpi_battery_flags flags;
         struct acpi_battery_trips trips;
         unsigned long alarm;
@@ -132,17 +135,16 @@ acpi_battery_get_info(struct acpi_battery *battery,
         struct acpi_buffer data = { 0, NULL };
         union acpi_object *package = NULL;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_get_info");
 
         if (!battery || !bif)
-                return_VALUE(-EINVAL);
+                return -EINVAL;
 
         /* Evalute _BIF */
 
-        status = acpi_evaluate_object(battery->handle, "_BIF", NULL, &buffer);
+        status = acpi_evaluate_object(battery->device->handle, "_BIF", NULL, &buffer);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _BIF\n"));
-                return_VALUE(-ENODEV);
+                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
+                return -ENODEV;
         }
 
         package = (union acpi_object *)buffer.pointer;
@@ -151,7 +153,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
 
         status = acpi_extract_package(package, &format, &data);
         if (status != AE_BUFFER_OVERFLOW) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _BIF\n"));
+                ACPI_EXCEPTION((AE_INFO, status, "Extracting _BIF"));
                 result = -ENODEV;
                 goto end;
         }
@@ -165,19 +167,19 @@ acpi_battery_get_info(struct acpi_battery *battery,
 
         status = acpi_extract_package(package, &format, &data);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _BIF\n"));
+                ACPI_EXCEPTION((AE_INFO, status, "Extracting _BIF"));
                 kfree(data.pointer);
                 result = -ENODEV;
                 goto end;
         }
 
       end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         if (!result)
                 (*bif) = (struct acpi_battery_info *)data.pointer;
 
-        return_VALUE(result);
+        return result;
 }
 
 static int
@@ -193,17 +195,16 @@ acpi_battery_get_status(struct acpi_battery *battery,
         struct acpi_buffer data = { 0, NULL };
         union acpi_object *package = NULL;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_get_status");
 
         if (!battery || !bst)
-                return_VALUE(-EINVAL);
+                return -EINVAL;
 
         /* Evalute _BST */
 
-        status = acpi_evaluate_object(battery->handle, "_BST", NULL, &buffer);
+        status = acpi_evaluate_object(battery->device->handle, "_BST", NULL, &buffer);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _BST\n"));
-                return_VALUE(-ENODEV);
+                ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
+                return -ENODEV;
         }
 
         package = (union acpi_object *)buffer.pointer;
@@ -212,7 +213,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
 
         status = acpi_extract_package(package, &format, &data);
         if (status != AE_BUFFER_OVERFLOW) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _BST\n"));
+                ACPI_EXCEPTION((AE_INFO, status, "Extracting _BST"));
                 result = -ENODEV;
                 goto end;
         }
@@ -226,19 +227,19 @@ acpi_battery_get_status(struct acpi_battery *battery,
 
         status = acpi_extract_package(package, &format, &data);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error extracting _BST\n"));
+                ACPI_EXCEPTION((AE_INFO, status, "Extracting _BST"));
                 kfree(data.pointer);
                 result = -ENODEV;
                 goto end;
         }
 
       end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         if (!result)
                 (*bst) = (struct acpi_battery_status *)data.pointer;
 
-        return_VALUE(result);
+        return result;
 }
 
 static int
@@ -248,25 +249,24 @@ acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long alarm)
         union acpi_object arg0 = { ACPI_TYPE_INTEGER };
         struct acpi_object_list arg_list = { 1, &arg0 };
 
-        ACPI_FUNCTION_TRACE("acpi_battery_set_alarm");
 
         if (!battery)
-                return_VALUE(-EINVAL);
+                return -EINVAL;
 
         if (!battery->flags.alarm)
-                return_VALUE(-ENODEV);
+                return -ENODEV;
 
         arg0.integer.value = alarm;
 
-        status = acpi_evaluate_object(battery->handle, "_BTP", &arg_list, NULL);
+        status = acpi_evaluate_object(battery->device->handle, "_BTP", &arg_list, NULL);
         if (ACPI_FAILURE(status))
-                return_VALUE(-ENODEV);
+                return -ENODEV;
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", (u32) alarm));
 
         battery->alarm = alarm;
 
-        return_VALUE(0);
+        return 0;
 }
 
 static int acpi_battery_check(struct acpi_battery *battery)
@@ -277,18 +277,15 @@ static int acpi_battery_check(struct acpi_battery *battery)
         struct acpi_device *device = NULL;
         struct acpi_battery_info *bif = NULL;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_check");
 
         if (!battery)
-                return_VALUE(-EINVAL);
+                return -EINVAL;
 
-        result = acpi_bus_get_device(battery->handle, &device);
-        if (result)
-                return_VALUE(result);
+        device = battery->device;
 
         result = acpi_bus_get_status(device);
         if (result)
-                return_VALUE(result);
+                return result;
 
         /* Insertion? */
 
@@ -300,7 +297,7 @@ static int acpi_battery_check(struct acpi_battery *battery)
 
                 result = acpi_battery_get_info(battery, &bif);
                 if (result)
-                        return_VALUE(result);
+                        return result;
 
                 battery->flags.power_unit = bif->power_unit;
                 battery->trips.warning = bif->design_capacity_warning;
@@ -309,7 +306,7 @@ static int acpi_battery_check(struct acpi_battery *battery)
 
                 /* See if alarms are supported, and if so, set default */
 
-                status = acpi_get_handle(battery->handle, "_BTP", &handle);
+                status = acpi_get_handle(battery->device->handle, "_BTP", &handle);
                 if (ACPI_SUCCESS(status)) {
                         battery->flags.alarm = 1;
                         acpi_battery_set_alarm(battery, battery->trips.warning);
@@ -324,7 +321,7 @@ static int acpi_battery_check(struct acpi_battery *battery)
 
         battery->flags.present = device->status.battery_present;
 
-        return_VALUE(result);
+        return result;
 }
 
 /* --------------------------------------------------------------------------
@@ -339,7 +336,6 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)
         struct acpi_battery_info *bif = NULL;
         char *units = "?";
 
-        ACPI_FUNCTION_TRACE("acpi_battery_read_info");
 
         if (!battery)
                 goto end;
@@ -409,7 +405,7 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)
       end:
         kfree(bif);
 
-        return_VALUE(0);
+        return 0;
 }
 
 static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
@@ -424,7 +420,6 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
         struct acpi_battery_status *bst = NULL;
         char *units = "?";
 
-        ACPI_FUNCTION_TRACE("acpi_battery_read_state");
 
         if (!battery)
                 goto end;
@@ -458,8 +453,6 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
         if ((bst->state & 0x01) && (bst->state & 0x02)) {
                 seq_printf(seq,
                            "charging state:          charging/discharging\n");
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Battery Charging and Discharging?\n"));
         } else if (bst->state & 0x01)
                 seq_printf(seq, "charging state:          discharging\n");
         else if (bst->state & 0x02)
@@ -489,7 +482,7 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
       end:
         kfree(bst);
 
-        return_VALUE(0);
+        return 0;
 }
 
 static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
@@ -502,7 +495,6 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
         struct acpi_battery *battery = (struct acpi_battery *)seq->private;
         char *units = "?";
 
-        ACPI_FUNCTION_TRACE("acpi_battery_read_alarm");
 
         if (!battery)
                 goto end;
@@ -527,7 +519,7 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
                 seq_printf(seq, "%d %sh\n", (u32) battery->alarm, units);
 
       end:
-        return_VALUE(0);
+        return 0;
 }
 
 static ssize_t
@@ -540,25 +532,24 @@ acpi_battery_write_alarm(struct file *file,
         struct seq_file *m = (struct seq_file *)file->private_data;
         struct acpi_battery *battery = (struct acpi_battery *)m->private;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_write_alarm");
 
         if (!battery || (count > sizeof(alarm_string) - 1))
-                return_VALUE(-EINVAL);
+                return -EINVAL;
 
         if (!battery->flags.present)
-                return_VALUE(-ENODEV);
+                return -ENODEV;
 
         if (copy_from_user(alarm_string, buffer, count))
-                return_VALUE(-EFAULT);
+                return -EFAULT;
 
         alarm_string[count] = '\0';
 
         result = acpi_battery_set_alarm(battery,
                                         simple_strtoul(alarm_string, NULL, 0));
         if (result)
-                return_VALUE(result);
+                return result;
 
-        return_VALUE(count);
+        return count;
 }
 
 static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
@@ -566,7 +557,7 @@ static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file)
         return single_open(file, acpi_battery_read_alarm, PDE(inode)->data);
 }
 
-static struct file_operations acpi_battery_info_ops = {
+static const struct file_operations acpi_battery_info_ops = {
         .open = acpi_battery_info_open_fs,
         .read = seq_read,
         .llseek = seq_lseek,
@@ -574,7 +565,7 @@ static struct file_operations acpi_battery_info_ops = {
         .owner = THIS_MODULE,
 };
 
-static struct file_operations acpi_battery_state_ops = {
+static const struct file_operations acpi_battery_state_ops = {
         .open = acpi_battery_state_open_fs,
         .read = seq_read,
         .llseek = seq_lseek,
@@ -582,7 +573,7 @@ static struct file_operations acpi_battery_state_ops = {
         .owner = THIS_MODULE,
 };
 
-static struct file_operations acpi_battery_alarm_ops = {
+static const struct file_operations acpi_battery_alarm_ops = {
         .open = acpi_battery_alarm_open_fs,
         .read = seq_read,
         .write = acpi_battery_write_alarm,
@@ -595,13 +586,12 @@ static int acpi_battery_add_fs(struct acpi_device *device)
 {
         struct proc_dir_entry *entry = NULL;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_add_fs");
 
         if (!acpi_device_dir(device)) {
                 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
                                                      acpi_battery_dir);
                 if (!acpi_device_dir(device))
-                        return_VALUE(-ENODEV);
+                        return -ENODEV;
                 acpi_device_dir(device)->owner = THIS_MODULE;
         }
 
@@ -609,9 +599,7 @@ static int acpi_battery_add_fs(struct acpi_device *device)
         entry = create_proc_entry(ACPI_BATTERY_FILE_INFO,
                                   S_IRUGO, acpi_device_dir(device));
         if (!entry)
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unable to create '%s' fs entry\n",
-                                  ACPI_BATTERY_FILE_INFO));
+                return -ENODEV;
         else {
                 entry->proc_fops = &acpi_battery_info_ops;
                 entry->data = acpi_driver_data(device);
@@ -622,9 +610,7 @@ static int acpi_battery_add_fs(struct acpi_device *device)
         entry = create_proc_entry(ACPI_BATTERY_FILE_STATUS,
                                   S_IRUGO, acpi_device_dir(device));
         if (!entry)
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unable to create '%s' fs entry\n",
-                                  ACPI_BATTERY_FILE_STATUS));
+                return -ENODEV;
         else {
                 entry->proc_fops = &acpi_battery_state_ops;
                 entry->data = acpi_driver_data(device);
@@ -636,21 +622,18 @@ static int acpi_battery_add_fs(struct acpi_device *device)
                                   S_IFREG | S_IRUGO | S_IWUSR,
                                   acpi_device_dir(device));
         if (!entry)
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Unable to create '%s' fs entry\n",
-                                  ACPI_BATTERY_FILE_ALARM));
+                return -ENODEV;
         else {
                 entry->proc_fops = &acpi_battery_alarm_ops;
                 entry->data = acpi_driver_data(device);
                 entry->owner = THIS_MODULE;
         }
 
-        return_VALUE(0);
+        return 0;
 }
 
 static int acpi_battery_remove_fs(struct acpi_device *device)
 {
-        ACPI_FUNCTION_TRACE("acpi_battery_remove_fs");
 
         if (acpi_device_dir(device)) {
                 remove_proc_entry(ACPI_BATTERY_FILE_ALARM,
@@ -664,7 +647,7 @@ static int acpi_battery_remove_fs(struct acpi_device *device)
                 acpi_device_dir(device) = NULL;
         }
 
-        return_VALUE(0);
+        return 0;
 }
 
 /* --------------------------------------------------------------------------
@@ -676,17 +659,17 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
         struct acpi_battery *battery = (struct acpi_battery *)data;
         struct acpi_device *device = NULL;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_notify");
 
         if (!battery)
-                return_VOID;
+                return;
 
-        if (acpi_bus_get_device(handle, &device))
-                return_VOID;
+        device = battery->device;
 
         switch (event) {
         case ACPI_BATTERY_NOTIFY_STATUS:
         case ACPI_BATTERY_NOTIFY_INFO:
+        case ACPI_NOTIFY_BUS_CHECK:
+        case ACPI_NOTIFY_DEVICE_CHECK:
                 acpi_battery_check(battery);
                 acpi_bus_generate_event(device, event, battery->flags.present);
                 break;
@@ -696,7 +679,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
                 break;
         }
 
-        return_VOID;
+        return;
 }
 
 static int acpi_battery_add(struct acpi_device *device)
@@ -705,17 +688,16 @@ static int acpi_battery_add(struct acpi_device *device)
         acpi_status status = 0;
         struct acpi_battery *battery = NULL;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_add");
 
         if (!device)
-                return_VALUE(-EINVAL);
+                return -EINVAL;
 
         battery = kmalloc(sizeof(struct acpi_battery), GFP_KERNEL);
         if (!battery)
-                return_VALUE(-ENOMEM);
+                return -ENOMEM;
         memset(battery, 0, sizeof(struct acpi_battery));
 
-        battery->handle = device->handle;
+        battery->device = device;
         strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
         acpi_driver_data(device) = battery;
@@ -728,12 +710,10 @@ static int acpi_battery_add(struct acpi_device *device)
         if (result)
                 goto end;
 
-        status = acpi_install_notify_handler(battery->handle,
-                                             ACPI_DEVICE_NOTIFY,
+        status = acpi_install_notify_handler(device->handle,
+                                             ACPI_ALL_NOTIFY,
                                              acpi_battery_notify, battery);
         if (ACPI_FAILURE(status)) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Error installing notify handler\n"));
                 result = -ENODEV;
                 goto end;
         }
@@ -748,7 +728,7 @@ static int acpi_battery_add(struct acpi_device *device)
                 kfree(battery);
         }
 
-        return_VALUE(result);
+        return result;
 }
 
 static int acpi_battery_remove(struct acpi_device *device, int type)
@@ -756,56 +736,51 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
         acpi_status status = 0;
         struct acpi_battery *battery = NULL;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_remove");
 
         if (!device || !acpi_driver_data(device))
-                return_VALUE(-EINVAL);
+                return -EINVAL;
 
         battery = (struct acpi_battery *)acpi_driver_data(device);
 
-        status = acpi_remove_notify_handler(battery->handle,
-                                            ACPI_DEVICE_NOTIFY,
+        status = acpi_remove_notify_handler(device->handle,
+                                            ACPI_ALL_NOTIFY,
                                             acpi_battery_notify);
-        if (ACPI_FAILURE(status))
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Error removing notify handler\n"));
 
         acpi_battery_remove_fs(device);
 
         kfree(battery);
 
-        return_VALUE(0);
+        return 0;
 }
 
 static int __init acpi_battery_init(void)
 {
-        int result = 0;
+        int result;
 
-        ACPI_FUNCTION_TRACE("acpi_battery_init");
+        if (acpi_disabled)
+                return -ENODEV;
 
-        acpi_battery_dir = proc_mkdir(ACPI_BATTERY_CLASS, acpi_root_dir);
+        acpi_battery_dir = acpi_lock_battery_dir();
         if (!acpi_battery_dir)
-                return_VALUE(-ENODEV);
-        acpi_battery_dir->owner = THIS_MODULE;
+                return -ENODEV;
 
         result = acpi_bus_register_driver(&acpi_battery_driver);
         if (result < 0) {
-                remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);
-                return_VALUE(-ENODEV);
+                acpi_unlock_battery_dir(acpi_battery_dir);
+                return -ENODEV;
         }
 
-        return_VALUE(0);
+        return 0;
 }
 
 static void __exit acpi_battery_exit(void)
 {
-        ACPI_FUNCTION_TRACE("acpi_battery_exit");
 
         acpi_bus_unregister_driver(&acpi_battery_driver);
 
-        remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);
+        acpi_unlock_battery_dir(acpi_battery_dir);
 
-        return_VOID;
+        return;
 }
 
 module_init(acpi_battery_init);