| .. | .. |
|---|
| 10 | 10 | #include "sleep.h" |
|---|
| 11 | 11 | #include "internal.h" |
|---|
| 12 | 12 | |
|---|
| 13 | | -#define _COMPONENT ACPI_SYSTEM_COMPONENT |
|---|
| 14 | | - |
|---|
| 15 | 13 | /* |
|---|
| 16 | 14 | * this file provides support for: |
|---|
| 17 | 15 | * /proc/acpi/wakeup |
|---|
| 18 | 16 | */ |
|---|
| 19 | 17 | |
|---|
| 20 | | -ACPI_MODULE_NAME("sleep") |
|---|
| 21 | | - |
|---|
| 22 | 18 | static int |
|---|
| 23 | 19 | acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) |
|---|
| 24 | 20 | { |
|---|
| 25 | | - struct list_head *node, *next; |
|---|
| 21 | + struct acpi_device *dev, *tmp; |
|---|
| 26 | 22 | |
|---|
| 27 | 23 | seq_printf(seq, "Device\tS-state\t Status Sysfs node\n"); |
|---|
| 28 | 24 | |
|---|
| 29 | 25 | mutex_lock(&acpi_device_lock); |
|---|
| 30 | | - list_for_each_safe(node, next, &acpi_wakeup_device_list) { |
|---|
| 31 | | - struct acpi_device *dev = |
|---|
| 32 | | - container_of(node, struct acpi_device, wakeup_list); |
|---|
| 26 | + list_for_each_entry_safe(dev, tmp, &acpi_wakeup_device_list, |
|---|
| 27 | + wakeup_list) { |
|---|
| 33 | 28 | struct acpi_device_physical_node *entry; |
|---|
| 34 | 29 | |
|---|
| 35 | 30 | if (!dev->wakeup.flags.valid) |
|---|
| .. | .. |
|---|
| 96 | 91 | const char __user * buffer, |
|---|
| 97 | 92 | size_t count, loff_t * ppos) |
|---|
| 98 | 93 | { |
|---|
| 99 | | - struct list_head *node, *next; |
|---|
| 94 | + struct acpi_device *dev, *tmp; |
|---|
| 100 | 95 | char strbuf[5]; |
|---|
| 101 | 96 | char str[5] = ""; |
|---|
| 102 | 97 | |
|---|
| .. | .. |
|---|
| 109 | 104 | sscanf(strbuf, "%s", str); |
|---|
| 110 | 105 | |
|---|
| 111 | 106 | mutex_lock(&acpi_device_lock); |
|---|
| 112 | | - list_for_each_safe(node, next, &acpi_wakeup_device_list) { |
|---|
| 113 | | - struct acpi_device *dev = |
|---|
| 114 | | - container_of(node, struct acpi_device, wakeup_list); |
|---|
| 107 | + list_for_each_entry_safe(dev, tmp, &acpi_wakeup_device_list, |
|---|
| 108 | + wakeup_list) { |
|---|
| 115 | 109 | if (!dev->wakeup.flags.valid) |
|---|
| 116 | 110 | continue; |
|---|
| 117 | 111 | |
|---|
| .. | .. |
|---|
| 136 | 130 | PDE_DATA(inode)); |
|---|
| 137 | 131 | } |
|---|
| 138 | 132 | |
|---|
| 139 | | -static const struct file_operations acpi_system_wakeup_device_fops = { |
|---|
| 140 | | - .owner = THIS_MODULE, |
|---|
| 141 | | - .open = acpi_system_wakeup_device_open_fs, |
|---|
| 142 | | - .read = seq_read, |
|---|
| 143 | | - .write = acpi_system_write_wakeup_device, |
|---|
| 144 | | - .llseek = seq_lseek, |
|---|
| 145 | | - .release = single_release, |
|---|
| 133 | +static const struct proc_ops acpi_system_wakeup_device_proc_ops = { |
|---|
| 134 | + .proc_open = acpi_system_wakeup_device_open_fs, |
|---|
| 135 | + .proc_read = seq_read, |
|---|
| 136 | + .proc_write = acpi_system_write_wakeup_device, |
|---|
| 137 | + .proc_lseek = seq_lseek, |
|---|
| 138 | + .proc_release = single_release, |
|---|
| 146 | 139 | }; |
|---|
| 147 | 140 | |
|---|
| 148 | 141 | void __init acpi_sleep_proc_init(void) |
|---|
| 149 | 142 | { |
|---|
| 150 | 143 | /* 'wakeup device' [R/W] */ |
|---|
| 151 | 144 | proc_create("wakeup", S_IFREG | S_IRUGO | S_IWUSR, |
|---|
| 152 | | - acpi_root_dir, &acpi_system_wakeup_device_fops); |
|---|
| 145 | + acpi_root_dir, &acpi_system_wakeup_device_proc_ops); |
|---|
| 153 | 146 | } |
|---|