[PATCH] bnx2x: replace usage of found with dedicated list iterator variable

From: Jakob Koschel
Date: Thu Mar 24 2022 - 03:08:47 EST


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@xxxxxxxxxxxxxx/
Signed-off-by: Jakob Koschel <jakobkoschel@xxxxxxxxx>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index c19b072f3a23..fe985ddb35db 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -12971,20 +12971,19 @@ static int bnx2x_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)

static int bnx2x_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
{
+ struct bnx2x_vlan_entry *vlan = NULL, *iter;
struct bnx2x *bp = netdev_priv(dev);
- struct bnx2x_vlan_entry *vlan;
- bool found = false;
int rc = 0;

DP(NETIF_MSG_IFUP, "Removing VLAN %d\n", vid);

- list_for_each_entry(vlan, &bp->vlan_reg, link)
- if (vlan->vid == vid) {
- found = true;
+ list_for_each_entry(iter, &bp->vlan_reg, link)
+ if (iter->vid == vid) {
+ vlan = iter;
break;
}

- if (!found) {
+ if (!vlan) {
BNX2X_ERR("Unable to kill VLAN %d - not found\n", vid);
return -EINVAL;
}

base-commit: f443e374ae131c168a065ea1748feac6b2e76613
--
2.25.1