net/wireless: Delete unnecessary checks before the macro call “dev_kfree_skb”

The dev_kfree_skb() function performs also input parameter validation.
Thus the test around the shown calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index f0ab11556dc22bf52e532e929cf5896a7296cba2..74ad60a71a1f3f1e89bc763cdd38d61b8f8cee13 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -9481,7 +9481,5 @@ void ath10k_wmi_detach(struct ath10k *ar)
        }
 
        cancel_work_sync(&ar->svc_rdy_work);
-
-       if (ar->svc_rdy_skb)
-               dev_kfree_skb(ar->svc_rdy_skb);
+       dev_kfree_skb(ar->svc_rdy_skb);
 }

diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
index 4fbcc7fba3cc14760fa90ac9dc8baa4c8f0734d3..1168055da1828fe9f940df5efee225f062f47c80 100644 (file)
--- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
@@ -2301,9 +2301,7 @@ __il3945_down(struct il_priv *il)
        il3945_hw_txq_ctx_free(il);
 exit:
        memset(&il->card_alive, 0, sizeof(struct il_alive_resp));
-
-       if (il->beacon_skb)
-               dev_kfree_skb(il->beacon_skb);
+       dev_kfree_skb(il->beacon_skb);
        il->beacon_skb = NULL;
 
        /* clear out any free frames */
@@ -3846,9 +3844,7 @@ il3945_pci_remove(struct pci_dev *pdev)
        il_free_channel_map(il);
        il_free_geos(il);
        kfree(il->scan_cmd);
-       if (il->beacon_skb)
-               dev_kfree_skb(il->beacon_skb);
-
+       dev_kfree_skb(il->beacon_skb);
        ieee80211_free_hw(il->hw);
 }
 

diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c
index e4ea734e58d8f7df528f7fc33b234aca6f8283a6..d966b29b45ee7716499edae1ff171cd77176604b 100644 (file)
--- a/drivers/net/wireless/intel/iwlegacy/common.c
+++ b/drivers/net/wireless/intel/iwlegacy/common.c
@@ -5182,8 +5182,7 @@ il_mac_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        memset(&il->current_ht_config, 0, sizeof(struct il_ht_config));
 
        /* new association get rid of ibss beacon skb */
-       if (il->beacon_skb)
-               dev_kfree_skb(il->beacon_skb);
+       dev_kfree_skb(il->beacon_skb);
        il->beacon_skb = NULL;
        il->timestamp = 0;
 
@@ -5302,10 +5301,7 @@ il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        }
 
        spin_lock_irqsave(&il->lock, flags);
-
-       if (il->beacon_skb)
-               dev_kfree_skb(il->beacon_skb);
-
+       dev_kfree_skb(il->beacon_skb);
        il->beacon_skb = skb;
 
        timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
index 92305bd31aa1a996d210b27534e21ed59598af2d..4209209ac940d8330a59b2f56421451f6c1a0950 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
@@ -77,10 +77,7 @@ int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx,
        for (i = 0; i < ARRAY_SIZE(dev->beacons); i++) {
                if (vif_idx == i) {
                        force_update = !!dev->beacons[i] ^ !!skb;
-
-                       if (dev->beacons[i])
-                               dev_kfree_skb(dev->beacons[i]);
-
+                       dev_kfree_skb(dev->beacons[i]);
                        dev->beacons[i] = skb;
                        __mt76x02_mac_set_beacon(dev, bcn_idx, skb);
                } else if (force_update && dev->beacons[i]) {

diff --git a/drivers/net/wireless/st/cw1200/scan.c b/drivers/net/wireless/st/cw1200/scan.c
index c46b044b7f7be72b6db186e4a8b8de809aa38530..988581cc134b7cf7f0bcdb4098bac7a5d4f764e0 100644 (file)
--- a/drivers/net/wireless/st/cw1200/scan.c
+++ b/drivers/net/wireless/st/cw1200/scan.c
@@ -120,8 +120,7 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,
                ++priv->scan.n_ssids;
        }
 
-       if (frame.skb)
-               dev_kfree_skb(frame.skb);
+       dev_kfree_skb(frame.skb);
        mutex_unlock(&priv->conf_mutex);
        queue_work(priv->workqueue, &priv->scan.work);
        return 0;