ACPI: list_for_each_safe() -> list_for_each_entry_safe()

Replace list_for_each_safe() and open-coded list entry address
computations with list_for_each_entry_safe() in several places to
simplify code.

Signed-off-by: chenqiwu <chenqiwu@xiaomi.com>
[ rjw: Subject & changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index 0e62ef265ce40ce6d00f7e2c44595137eab33b29..7892980b3ce4d3b4e0769d710084d154d3a4006a 100644 (file)
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@ -22,14 +22,13 @@ ACPI_MODULE_NAME("sleep")
 static int
 acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 {
-       struct list_head *node, *next;
+       struct acpi_device *dev, *tmp;
 
        seq_printf(seq, "Device\tS-state\t  Status   Sysfs node\n");
 
        mutex_lock(&acpi_device_lock);
-       list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-               struct acpi_device *dev =
-                   container_of(node, struct acpi_device, wakeup_list);
+       list_for_each_entry_safe(dev, tmp, &acpi_wakeup_device_list,
+                                wakeup_list) {
                struct acpi_device_physical_node *entry;
 
                if (!dev->wakeup.flags.valid)
@@ -96,7 +95,7 @@ acpi_system_write_wakeup_device(struct file *file,
                                const char __user * buffer,
                                size_t count, loff_t * ppos)
 {
-       struct list_head *node, *next;
+       struct acpi_device *dev, *tmp;
        char strbuf[5];
        char str[5] = "";
 
@@ -109,9 +108,8 @@ acpi_system_write_wakeup_device(struct file *file,
        sscanf(strbuf, "%s", str);
 
        mutex_lock(&acpi_device_lock);
-       list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-               struct acpi_device *dev =
-                   container_of(node, struct acpi_device, wakeup_list);
+       list_for_each_entry_safe(dev, tmp, &acpi_wakeup_device_list,
+                                wakeup_list) {
                if (!dev->wakeup.flags.valid)
                        continue;
 

diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index 9614126bf56eed29147c84ae74eb6431f1b5927a..c28244df56a501a6c4f8a2ee4ea3945d7db115fa 100644 (file)
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -30,12 +30,10 @@ ACPI_MODULE_NAME("wakeup_devices")
  */
 void acpi_enable_wakeup_devices(u8 sleep_state)
 {
-       struct list_head *node, *next;
-
-       list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-               struct acpi_device *dev =
-                       container_of(node, struct acpi_device, wakeup_list);
+       struct acpi_device *dev, *tmp;
 
+       list_for_each_entry_safe(dev, tmp, &acpi_wakeup_device_list,
+                                wakeup_list) {
                if (!dev->wakeup.flags.valid
                    || sleep_state > (u32) dev->wakeup.sleep_state
                    || !(device_may_wakeup(&dev->dev)
@@ -57,12 +55,10 @@ void acpi_enable_wakeup_devices(u8 sleep_state)
  */
 void acpi_disable_wakeup_devices(u8 sleep_state)
 {
-       struct list_head *node, *next;
-
-       list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-               struct acpi_device *dev =
-                       container_of(node, struct acpi_device, wakeup_list);
+       struct acpi_device *dev, *tmp;
 
+       list_for_each_entry_safe(dev, tmp, &acpi_wakeup_device_list,
+                                wakeup_list) {
                if (!dev->wakeup.flags.valid
                    || sleep_state > (u32) dev->wakeup.sleep_state
                    || !(device_may_wakeup(&dev->dev)
@@ -79,13 +75,11 @@ void acpi_disable_wakeup_devices(u8 sleep_state)
 
 int __init acpi_wakeup_device_init(void)
 {
-       struct list_head *node, *next;
+       struct acpi_device *dev, *tmp;
 
        mutex_lock(&acpi_device_lock);
-       list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-               struct acpi_device *dev = container_of(node,
-                                                      struct acpi_device,
-                                                      wakeup_list);
+       list_for_each_entry_safe(dev, tmp, &acpi_wakeup_device_list,
+                                wakeup_list) {
                if (device_can_wakeup(&dev->dev)) {
                        /* Button GPEs are supposed to be always enabled. */
                        acpi_enable_gpe(dev->wakeup.gpe_device,