rtlwifi: replace usage of found with dedicated list iterator variable

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>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220324072124.62458-1-jakobkoschel@gmail.com

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index ffd150e..a7ef84f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -1994,8 +1994,7 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        unsigned long flags;
 
-       struct rtl_bssid_entry *entry;
-       bool entry_found = false;
+       struct rtl_bssid_entry *entry = NULL, *iter;
 
        /* check if it is scanning */
        if (!mac->act_scanning)
@@ -2008,10 +2007,10 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)
 
        spin_lock_irqsave(&rtlpriv->locks.scan_list_lock, flags);
 
-       list_for_each_entry(entry, &rtlpriv->scan_list.list, list) {
-               if (memcmp(entry->bssid, hdr->addr3, ETH_ALEN) == 0) {
-                       list_del_init(&entry->list);
-                       entry_found = true;
+       list_for_each_entry(iter, &rtlpriv->scan_list.list, list) {
+               if (memcmp(iter->bssid, hdr->addr3, ETH_ALEN) == 0) {
+                       list_del_init(&iter->list);
+                       entry = iter;
                        rtl_dbg(rtlpriv, COMP_SCAN, DBG_LOUD,
                                "Update BSSID=%pM to scan list (total=%d)\n",
                                hdr->addr3, rtlpriv->scan_list.num);
@@ -2019,7 +2018,7 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)
                }
        }
 
-       if (!entry_found) {
+       if (!entry) {
                entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
 
                if (!entry)

diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index ad327ba..8e4c156 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -323,14 +323,13 @@ static bool rtl_pci_check_buddy_priv(struct ieee80211_hw *hw,
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
-       bool find_buddy_priv = false;
-       struct rtl_priv *tpriv;
+       struct rtl_priv *tpriv = NULL, *iter;
        struct rtl_pci_priv *tpcipriv = NULL;
 
        if (!list_empty(&rtlpriv->glb_var->glb_priv_list)) {
-               list_for_each_entry(tpriv, &rtlpriv->glb_var->glb_priv_list,
+               list_for_each_entry(iter, &rtlpriv->glb_var->glb_priv_list,
                                    list) {
-                       tpcipriv = (struct rtl_pci_priv *)tpriv->priv;
+                       tpcipriv = (struct rtl_pci_priv *)iter->priv;
                        rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
                                "pcipriv->ndis_adapter.funcnumber %x\n",
                                pcipriv->ndis_adapter.funcnumber);
@@ -344,19 +343,19 @@ static bool rtl_pci_check_buddy_priv(struct ieee80211_hw *hw,
                            tpcipriv->ndis_adapter.devnumber &&
                            pcipriv->ndis_adapter.funcnumber !=
                            tpcipriv->ndis_adapter.funcnumber) {
-                               find_buddy_priv = true;
+                               tpriv = iter;
                                break;
                        }
                }
        }
 
        rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD,
-               "find_buddy_priv %d\n", find_buddy_priv);
+               "find_buddy_priv %d\n", tpriv != NULL);
 
-       if (find_buddy_priv)
+       if (tpriv)
                *buddy_priv = tpriv;
 
-       return find_buddy_priv;
+       return tpriv != NULL;
 }
 
 static void rtl_pci_get_linkcontrol_field(struct ieee80211_hw *hw)