wifi: rtlwifi: cleanup few rtlxxx_tx_fill_desc() routines

Remove unreachable branches in 'rtl92ce_tx_fill_desc()',
'rtl92cu_tx_fill_desc()' and 'rtl8723e_tx_fill_desc()'.
Compile tested only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240109104735.140550-1-dmantipov@yandex.ru

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
index 50e139186a938874105b0cbc52f8520260bba150..ed151754fc6ea7cebd13c0088844798739dfde4a 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
@@ -350,7 +350,6 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-       bool defaultadapter = true;
        __le32 *pdesc = (__le32 *)pdesc8;
        u16 seq_number;
        __le16 fc = hdr->frame_control;
@@ -503,9 +502,6 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
        if ((!ieee80211_is_data_qos(fc)) && ppsc->fwctrl_lps) {
                set_tx_desc_hwseq_en(pdesc, 1);
                set_tx_desc_pkt_id(pdesc, 8);
-
-               if (!defaultadapter)
-                       set_tx_desc_qos(pdesc, 1);
        }
 
        set_tx_desc_more_frag(pdesc, (lastseg ? 0 : 1));

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
index 2f44c8aa6066df64b021330126f061b57ec84d3a..e5c81c1c63c056822615aa0c70915c78e9487e80 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c
@@ -475,7 +475,6 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-       bool defaultadapter = true;
        u8 *qc = ieee80211_get_qos_ctl(hdr);
        u8 tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
        u16 seq_number;
@@ -587,8 +586,6 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
              ppsc->fwctrl_lps) {
                set_tx_desc_hwseq_en(txdesc, 1);
                set_tx_desc_pkt_id(txdesc, 8);
-               if (!defaultadapter)
-                       set_tx_desc_qos(txdesc, 1);
        }
        if (ieee80211_has_morefrags(fc))
                set_tx_desc_more_frag(txdesc, 1);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
index d9823ddab7becb87786f342a4d0d860b737774e8..65bfc14702f47b0034b52c18c8b3a14c94d7441e 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
@@ -349,7 +349,6 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-       bool b_defaultadapter = true;
        /* bool b_trigger_ac = false; */
        u8 *pdesc8 = (u8 *)pdesc_tx;
        __le32 *pdesc = (__le32 *)pdesc8;
@@ -503,10 +502,7 @@ void rtl8723e_tx_fill_desc(struct ieee80211_hw *hw,
                set_tx_desc_hwseq_en_8723(pdesc, 1);
                /* set_tx_desc_hwseq_en(pdesc, 1); */
                /* set_tx_desc_pkt_id(pdesc, 8); */
-
-               if (!b_defaultadapter)
-                       set_tx_desc_hwseq_sel_8723(pdesc, 1);
-       /* set_tx_desc_qos(pdesc, 1); */
+               /* set_tx_desc_qos(pdesc, 1); */
        }
 
        set_tx_desc_more_frag(pdesc, (lastseg ? 0 : 1));