aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/event.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/event.c')
-rw-r--r--drivers/acpi/event.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 43c49f66a328..ce8d3eec3911 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -24,27 +24,23 @@ extern wait_queue_head_t acpi_bus_event_queue;
24static int 24static int
25acpi_system_open_event(struct inode *inode, struct file *file) 25acpi_system_open_event(struct inode *inode, struct file *file)
26{ 26{
27 spin_lock_irq (&acpi_system_event_lock); 27 spin_lock_irq(&acpi_system_event_lock);
28 28
29 if(event_is_open) 29 if (event_is_open)
30 goto out_busy; 30 goto out_busy;
31 31
32 event_is_open = 1; 32 event_is_open = 1;
33 33
34 spin_unlock_irq (&acpi_system_event_lock); 34 spin_unlock_irq(&acpi_system_event_lock);
35 return 0; 35 return 0;
36 36
37out_busy: 37out_busy:
38 spin_unlock_irq (&acpi_system_event_lock); 38 spin_unlock_irq(&acpi_system_event_lock);
39 return -EBUSY; 39 return -EBUSY;
40} 40}
41 41
42static ssize_t 42static ssize_t
43acpi_system_read_event ( 43acpi_system_read_event(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
44 struct file *file,
45 char __user *buffer,
46 size_t count,
47 loff_t *ppos)
48{ 44{
49 int result = 0; 45 int result = 0;
50 struct acpi_bus_event event; 46 struct acpi_bus_event event;
@@ -98,9 +94,7 @@ acpi_system_close_event(struct inode *inode, struct file *file)
98} 94}
99 95
100static unsigned int 96static unsigned int
101acpi_system_poll_event( 97acpi_system_poll_event(struct file *file, poll_table *wait)
102 struct file *file,
103 poll_table *wait)
104{ 98{
105 poll_wait(file, &acpi_bus_event_queue, wait); 99 poll_wait(file, &acpi_bus_event_queue, wait);
106 if (!list_empty(&acpi_bus_event_list)) 100 if (!list_empty(&acpi_bus_event_list))