iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ACPI: IPMI: replace usage of found with dedicated list iterator variable

Browse Source 
To move the list iterator variable into the list_for_each_entry_*()
macro in the future it should be avoided to use the list iterator
variable after the loop body.

To *never* use the list iterator variable after the loop it was
concluded to use a separate iterator variable instead of a
found boolean [1].

This removes the need to use a found variable and simply checking if
the variable was set, can determine if the break/goto was hit.

Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/
Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Jakob Koschel 2022-03-24 08:04:41 +01:00 committed by Rafael J. Wysocki
parent 242ba6656d
commit 26de0ab984
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/acpi/acpi_ipmi.c
View File

@ -353,29 +353,27 @@ static void ipmi_flush_tx_msg(struct acpi_ipmi_device *ipmi)
static void ipmi_cancel_tx_msg(struct acpi_ipmi_device *ipmi, static void ipmi_cancel_tx_msg(struct acpi_ipmi_device *ipmi,
struct acpi_ipmi_msg *msg) struct acpi_ipmi_msg *msg)
{ {
struct acpi_ipmi_msg *tx_msg, *temp; struct acpi_ipmi_msg *tx_msg = NULL, *iter, *temp;
bool msg_found = false;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&ipmi->tx_msg_lock, flags); spin_lock_irqsave(&ipmi->tx_msg_lock, flags);
list_for_each_entry_safe(tx_msg, temp, &ipmi->tx_msg_list, head) { list_for_each_entry_safe(iter, temp, &ipmi->tx_msg_list, head) {
if (msg == tx_msg) { if (msg == iter) {
msg_found = true; tx_msg = iter;
list_del(&tx_msg->head); list_del(&iter->head);
break; break;
} }
} }
spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags); spin_unlock_irqrestore(&ipmi->tx_msg_lock, flags);
if (msg_found) if (tx_msg)
acpi_ipmi_msg_put(tx_msg); acpi_ipmi_msg_put(tx_msg);
} }
static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
{ {
struct acpi_ipmi_device *ipmi_device = user_msg_data; struct acpi_ipmi_device *ipmi_device = user_msg_data;
bool msg_found = false; struct acpi_ipmi_msg *tx_msg = NULL, *iter, *temp;
struct acpi_ipmi_msg *tx_msg, *temp;
struct device *dev = ipmi_device->dev; struct device *dev = ipmi_device->dev;
unsigned long flags; unsigned long flags;
@ -387,16 +385,16 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
} }
spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags); spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags);
list_for_each_entry_safe(tx_msg, temp, &ipmi_device->tx_msg_list, head) { list_for_each_entry_safe(iter, temp, &ipmi_device->tx_msg_list, head) {
if (msg->msgid == tx_msg->tx_msgid) { if (msg->msgid == iter->tx_msgid) {
msg_found = true; tx_msg = iter;
list_del(&tx_msg->head); list_del(&iter->head);
break; break;
} }
} }
spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags); spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags);
if (!msg_found) { if (!tx_msg) {
dev_warn(dev, dev_warn(dev,
"Unexpected response (msg id %ld) is returned.\n", "Unexpected response (msg id %ld) is returned.\n",
msg->msgid); msg->msgid);
@ -482,15 +480,14 @@ err_ref:
static void ipmi_bmc_gone(int iface) static void ipmi_bmc_gone(int iface)
{ {
struct acpi_ipmi_device *ipmi_device, *temp; struct acpi_ipmi_device *ipmi_device = NULL, *iter, *temp;
bool dev_found = false;
mutex_lock(&driver_data.ipmi_lock); mutex_lock(&driver_data.ipmi_lock);
list_for_each_entry_safe(ipmi_device, temp, list_for_each_entry_safe(iter, temp,
&driver_data.ipmi_devices, head) { &driver_data.ipmi_devices, head) {
if (ipmi_device->ipmi_ifnum != iface) { if (iter->ipmi_ifnum != iface) {
dev_found = true; ipmi_device = iter;
__ipmi_dev_kill(ipmi_device); __ipmi_dev_kill(iter);
break; break;
} }
} }
@ -500,7 +497,7 @@ static void ipmi_bmc_gone(int iface)
struct acpi_ipmi_device, head); struct acpi_ipmi_device, head);
mutex_unlock(&driver_data.ipmi_lock); mutex_unlock(&driver_data.ipmi_lock);
if (dev_found) { if (ipmi_device) {
ipmi_flush_tx_msg(ipmi_device); ipmi_flush_tx_msg(ipmi_device);
acpi_ipmi_dev_put(ipmi_device); acpi_ipmi_dev_put(ipmi_device);
} }