Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[pandora-kernel.git] / drivers / acpi / event.c

diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 2dbb1b0..3b23562 100644 (file)
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -13,7 +13,7 @@
 #include <acpi/acpi_drivers.h>
 
 #define _COMPONENT             ACPI_SYSTEM_COMPONENT
-ACPI_MODULE_NAME("event")
+ACPI_MODULE_NAME("event");
 
 /* Global vars for handling event proc entry */
 static DEFINE_SPINLOCK(acpi_system_event_lock);
@@ -48,18 +48,17 @@ acpi_system_read_event(struct file *file, char __user * buffer, size_t count,
        static int chars_remaining = 0;
        static char *ptr;
 
-       ACPI_FUNCTION_TRACE("acpi_system_read_event");
 
        if (!chars_remaining) {
                memset(&event, 0, sizeof(struct acpi_bus_event));
 
                if ((file->f_flags & O_NONBLOCK)
                    && (list_empty(&acpi_bus_event_list)))
-                       return_VALUE(-EAGAIN);
+                       return -EAGAIN;
 
                result = acpi_bus_receive_event(&event);
                if (result)
-                       return_VALUE(result);
+                       return result;
 
                chars_remaining = sprintf(str, "%s %s %08x %08x\n",
                                          event.device_class ? event.
@@ -75,13 +74,13 @@ acpi_system_read_event(struct file *file, char __user * buffer, size_t count,
        }
 
        if (copy_to_user(buffer, ptr, count))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        *ppos += count;
        chars_remaining -= count;
        ptr += count;
 
-       return_VALUE(count);
+       return count;
 }
 
 static int acpi_system_close_event(struct inode *inode, struct file *file)
@@ -100,7 +99,7 @@ static unsigned int acpi_system_poll_event(struct file *file, poll_table * wait)
        return 0;
 }
 
-static struct file_operations acpi_system_event_ops = {
+static const struct file_operations acpi_system_event_ops = {
        .open = acpi_system_open_event,
        .read = acpi_system_read_event,
        .release = acpi_system_close_event,
@@ -112,22 +111,18 @@ static int __init acpi_event_init(void)
        struct proc_dir_entry *entry;
        int error = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_event_init");
 
        if (acpi_disabled)
-               return_VALUE(0);
+               return 0;
 
        /* 'event' [R] */
        entry = create_proc_entry("event", S_IRUSR, acpi_root_dir);
        if (entry)
                entry->proc_fops = &acpi_system_event_ops;
        else {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Unable to create '%s' proc fs entry\n",
-                                 "event"));
-               error = -EFAULT;
+               error = -ENODEV;
        }
-       return_VALUE(error);
+       return error;
 }
 
 subsys_initcall(acpi_event_init);