Driver core: warn when userspace writes to the uevent file in a non-supported way

[linux-2.6-omap-h63xx.git] / drivers / acpi / battery.c

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 00b0728efe820a28ece8497b4fb3e819c566b5d8..e64c76c8b7268a56562969d48b6c940bbda09bfc 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -42,7 +42,6 @@
 #define ACPI_BATTERY_COMPONENT         0x00040000
 #define ACPI_BATTERY_CLASS             "battery"
 #define ACPI_BATTERY_HID               "PNP0C0A"
-#define ACPI_BATTERY_DRIVER_NAME       "ACPI Battery Driver"
 #define ACPI_BATTERY_DEVICE_NAME       "Battery"
 #define ACPI_BATTERY_FILE_INFO         "info"
 #define ACPI_BATTERY_FILE_STATUS       "state"
@@ -53,21 +52,26 @@
 #define ACPI_BATTERY_UNITS_AMPS                "mA"
 
 #define _COMPONENT             ACPI_BATTERY_COMPONENT
-ACPI_MODULE_NAME("acpi_battery")
+ACPI_MODULE_NAME("battery");
 
-    MODULE_AUTHOR("Paul Diefenbaugh");
-MODULE_DESCRIPTION(ACPI_BATTERY_DRIVER_NAME);
+MODULE_AUTHOR("Paul Diefenbaugh");
+MODULE_DESCRIPTION("ACPI Battery Driver");
 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);
+static int acpi_battery_resume(struct acpi_device *device);
 
 static struct acpi_driver acpi_battery_driver = {
-       .name = ACPI_BATTERY_DRIVER_NAME,
+       .name = "battery",
        .class = ACPI_BATTERY_CLASS,
        .ids = ACPI_BATTERY_HID,
        .ops = {
                .add = acpi_battery_add,
+               .resume = acpi_battery_resume,
                .remove = acpi_battery_remove,
                },
 };
@@ -108,7 +112,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;
@@ -138,13 +142,13 @@ acpi_battery_get_info(struct acpi_battery *battery,
 
        /* 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_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));
                return -ENODEV;
        }
 
-       package = (union acpi_object *)buffer.pointer;
+       package = buffer.pointer;
 
        /* Extract Package Data */
 
@@ -155,12 +159,11 @@ acpi_battery_get_info(struct acpi_battery *battery,
                goto end;
        }
 
-       data.pointer = kmalloc(data.length, GFP_KERNEL);
+       data.pointer = kzalloc(data.length, GFP_KERNEL);
        if (!data.pointer) {
                result = -ENOMEM;
                goto end;
        }
-       memset(data.pointer, 0, data.length);
 
        status = acpi_extract_package(package, &format, &data);
        if (ACPI_FAILURE(status)) {
@@ -171,10 +174,10 @@ acpi_battery_get_info(struct acpi_battery *battery,
        }
 
       end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        if (!result)
-               (*bif) = (struct acpi_battery_info *)data.pointer;
+               (*bif) = data.pointer;
 
        return result;
 }
@@ -198,13 +201,13 @@ acpi_battery_get_status(struct acpi_battery *battery,
 
        /* 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_EXCEPTION((AE_INFO, status, "Evaluating _BST"));
                return -ENODEV;
        }
 
-       package = (union acpi_object *)buffer.pointer;
+       package = buffer.pointer;
 
        /* Extract Package Data */
 
@@ -215,12 +218,11 @@ acpi_battery_get_status(struct acpi_battery *battery,
                goto end;
        }
 
-       data.pointer = kmalloc(data.length, GFP_KERNEL);
+       data.pointer = kzalloc(data.length, GFP_KERNEL);
        if (!data.pointer) {
                result = -ENOMEM;
                goto end;
        }
-       memset(data.pointer, 0, data.length);
 
        status = acpi_extract_package(package, &format, &data);
        if (ACPI_FAILURE(status)) {
@@ -231,10 +233,10 @@ acpi_battery_get_status(struct acpi_battery *battery,
        }
 
       end:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
 
        if (!result)
-               (*bst) = (struct acpi_battery_status *)data.pointer;
+               (*bst) = data.pointer;
 
        return result;
 }
@@ -255,7 +257,7 @@ acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long alarm)
 
        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 -ENODEV;
 
@@ -278,9 +280,7 @@ static int acpi_battery_check(struct acpi_battery *battery)
        if (!battery)
                return -EINVAL;
 
-       result = acpi_bus_get_device(battery->handle, &device);
-       if (result)
-               return result;
+       device = battery->device;
 
        result = acpi_bus_get_status(device);
        if (result)
@@ -305,7 +305,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);
@@ -323,6 +323,13 @@ static int acpi_battery_check(struct acpi_battery *battery)
        return result;
 }
 
+static void acpi_battery_check_present(struct acpi_battery *battery)
+{
+       if (!battery->flags.present) {
+               acpi_battery_check(battery);
+       }
+}
+
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
@@ -331,7 +338,7 @@ static struct proc_dir_entry *acpi_battery_dir;
 static int acpi_battery_read_info(struct seq_file *seq, void *offset)
 {
        int result = 0;
-       struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+       struct acpi_battery *battery = seq->private;
        struct acpi_battery_info *bif = NULL;
        char *units = "?";
 
@@ -339,6 +346,8 @@ static int acpi_battery_read_info(struct seq_file *seq, void *offset)
        if (!battery)
                goto end;
 
+       acpi_battery_check_present(battery);
+
        if (battery->flags.present)
                seq_printf(seq, "present:                 yes\n");
        else {
@@ -415,7 +424,7 @@ static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
 static int acpi_battery_read_state(struct seq_file *seq, void *offset)
 {
        int result = 0;
-       struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+       struct acpi_battery *battery = seq->private;
        struct acpi_battery_status *bst = NULL;
        char *units = "?";
 
@@ -423,6 +432,8 @@ static int acpi_battery_read_state(struct seq_file *seq, void *offset)
        if (!battery)
                goto end;
 
+       acpi_battery_check_present(battery);
+
        if (battery->flags.present)
                seq_printf(seq, "present:                 yes\n");
        else {
@@ -491,13 +502,15 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
 
 static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
 {
-       struct acpi_battery *battery = (struct acpi_battery *)seq->private;
+       struct acpi_battery *battery = seq->private;
        char *units = "?";
 
 
        if (!battery)
                goto end;
 
+       acpi_battery_check_present(battery);
+
        if (!battery->flags.present) {
                seq_printf(seq, "present:                 no\n");
                goto end;
@@ -528,13 +541,15 @@ acpi_battery_write_alarm(struct file *file,
 {
        int result = 0;
        char alarm_string[12] = { '\0' };
-       struct seq_file *m = (struct seq_file *)file->private_data;
-       struct acpi_battery *battery = (struct acpi_battery *)m->private;
+       struct seq_file *m = file->private_data;
+       struct acpi_battery *battery = m->private;
 
 
        if (!battery || (count > sizeof(alarm_string) - 1))
                return -EINVAL;
 
+       acpi_battery_check_present(battery);
+
        if (!battery->flags.present)
                return -ENODEV;
 
@@ -556,7 +571,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,
@@ -564,7 +579,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,
@@ -572,7 +587,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,
@@ -655,19 +670,20 @@ static int acpi_battery_remove_fs(struct acpi_device *device)
 
 static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
 {
-       struct acpi_battery *battery = (struct acpi_battery *)data;
+       struct acpi_battery *battery = data;
        struct acpi_device *device = NULL;
 
 
        if (!battery)
                return;
 
-       if (acpi_bus_get_device(handle, &device))
-               return;
+       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;
@@ -690,12 +706,11 @@ static int acpi_battery_add(struct acpi_device *device)
        if (!device)
                return -EINVAL;
 
-       battery = kmalloc(sizeof(struct acpi_battery), GFP_KERNEL);
+       battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
        if (!battery)
                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;
@@ -708,8 +723,8 @@ 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)) {
                result = -ENODEV;
@@ -738,10 +753,10 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
 
-       battery = (struct acpi_battery *)acpi_driver_data(device);
+       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);
 
        acpi_battery_remove_fs(device);
@@ -751,19 +766,32 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
        return 0;
 }
 
+/* this is needed to learn about changes made in suspended state */
+static int acpi_battery_resume(struct acpi_device *device)
+{
+       struct acpi_battery *battery;
+
+       if (!device)
+               return -EINVAL;
+
+       battery = device->driver_data;
+       return acpi_battery_check(battery);
+}
+
 static int __init acpi_battery_init(void)
 {
-       int result = 0;
+       int result;
 
+       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 -ENODEV;
-       acpi_battery_dir->owner = THIS_MODULE;
 
        result = acpi_bus_register_driver(&acpi_battery_driver);
        if (result < 0) {
-               remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);
+               acpi_unlock_battery_dir(acpi_battery_dir);
                return -ENODEV;
        }
 
@@ -775,7 +803,7 @@ static void __exit acpi_battery_exit(void)
 
        acpi_bus_unregister_driver(&acpi_battery_driver);
 
-       remove_proc_entry(ACPI_BATTERY_CLASS, acpi_root_dir);
+       acpi_unlock_battery_dir(acpi_battery_dir);
 
        return;
 }