acpi: list_for_each_safe() -> list_for_each_entry_safe()
PATCH 1/1 acpi: list_for_each_safe() -> list_for_each_entry_safe()
From: chenqiwu <[email protected]>
Use list_for_each_entry_safe() instead of list_for_each_safe() to simplify code.
Signed-off-by chenqiwu <[email protected]>
--- drivers/acpi/proc.c | 14 ++++++-------- drivers/acpi/wakeup.c | 24 +++++++++--------------- 2 files changed, 15 insertions(+), 23 deletions(-)
drivers/acpi/proc.c +6 -8
@@ -22,14 +22,13 @@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 @@ static void physical_device_enable_wakeup(struct acpi_device *adev)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 @@ static void physical_device_enable_wakeup(struct acpi_device *adev)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 ;
drivers/acpi/wakeup.c +9 -15
@@ -30,12 +30,10 @@*/ 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,
Signature · 1 line
1.9.1
Quoted 98 lines · On Sunday, February 23, 2020 7:08:22 AM CET [email protected] wrote:
From: chenqiwu <[email protected]>
Use
list_for_each_entry_safe()instead oflist_for_each_safe()to simplify code.Signed-off-by chenqiwu <[email protected]>--- drivers/acpi/proc.c | 14 ++++++-------- drivers/acpi/wakeup.c | 24 +++++++++--------------- 2 files changed, 15 insertions(+), 23 deletions(-)drivers/acpi/proc.c +6
-8@@ -22,14 +22,13 @@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 @@ static void physical_device_enable_wakeup(struct acpi_device *adev)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 @@ static void physical_device_enable_wakeup(struct acpi_device *adev)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 ;drivers/acpi/wakeup.c +7
-11@@ -30,12 +30,10 @@*/ 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;
drivers/acpi/wakeup.c void acpi_disable_wakeup_devices(u8 sleep_state) · line 85
Quoted 10 lines
drivers/acpi/wakeup.c +2
-4mutex_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,
Applied with modified subject and changelog as 5.7 material, thanks!