wifi: ath9k: cleanup a few (mostly) TX-related routines

Remove unused 'struct ath_softc *' argument of 'ath_pkt_duration()',
'ath_tx_update_baw()', 'ath_get_skb_tid()', 'ath_tx_addto_baw()' and
'ath_tx_count_frames()', adjust related users. Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Link: https://patch.msgid.link/20241209155027.636400-2-dmantipov@yandex.ru
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index bcfc8df0efe5b2c5510230e7f59592d51df8365e..3e06a7e85941930800ce52b961efe2c09dddd83f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -592,8 +592,8 @@ void ath_txq_schedule_all(struct ath_softc *sc);
 int ath_tx_init(struct ath_softc *sc, int nbufs);
 int ath_txq_update(struct ath_softc *sc, int qnum,
                   struct ath9k_tx_queue_info *q);
-u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, int pktlen,
-                    int width, int half_gi, bool shortPreamble);
+u32 ath_pkt_duration(u8 rix, int pktlen, int width,
+                    int half_gi, bool shortPreamble);
 void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop);
 void ath_assign_seq(struct ath_common *common, struct sk_buff *skb);
 int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 0c0624a3b40d21b6ec501c6a88cb51e452fe796c..34c74ed99b7b56df524632cdf54ca4457187ae33 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -1042,8 +1042,8 @@ static void ath_rx_count_airtime(struct ath_softc *sc,
        if (!!(rxs->encoding == RX_ENC_HT)) {
                /* MCS rates */
 
-               airtime += ath_pkt_duration(sc, rxs->rate_idx, len,
-                                       is_40, is_sgi, is_sp);
+               airtime += ath_pkt_duration(rxs->rate_idx, len,
+                                           is_40, is_sgi, is_sp);
        } else {
 
                phy = IS_CCK_RATE(rs->rs_rate) ? WLAN_RC_PHY_CCK : WLAN_RC_PHY_OFDM;

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index f41f03f55b07fd365e760c0cf94679f4a8166734..db07ce6dbc08037ab8f54393fccb493f129ccac0 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -67,8 +67,7 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,
 static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
                             struct ath_tx_status *ts, int nframes, int nbad,
                             int txok);
-static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
-                             struct ath_buf *bf);
+static void ath_tx_update_baw(struct ath_atx_tid *tid, struct ath_buf *bf);
 static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
                                           struct ath_txq *txq,
                                           struct ath_atx_tid *tid,
@@ -224,7 +223,7 @@ static void ath_txq_skb_done(struct ath_softc *sc, struct sk_buff *skb)
 }
 
 static struct ath_atx_tid *
-ath_get_skb_tid(struct ath_softc *sc, struct ath_node *an, struct sk_buff *skb)
+ath_get_skb_tid(struct ath_node *an, struct sk_buff *skb)
 {
        u8 tidno = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
        return ATH_AN_2_TID(an, tidno);
@@ -300,7 +299,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
                }
 
                if (fi->baw_tracked) {
-                       ath_tx_update_baw(sc, tid, bf);
+                       ath_tx_update_baw(tid, bf);
                        sendbar = true;
                }
 
@@ -315,8 +314,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
        }
 }
 
-static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
-                             struct ath_buf *bf)
+static void ath_tx_update_baw(struct ath_atx_tid *tid, struct ath_buf *bf)
 {
        struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
        u16 seqno = bf->bf_state.seqno;
@@ -338,8 +336,7 @@ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
        }
 }
 
-static void ath_tx_addto_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
-                            struct ath_buf *bf)
+static void ath_tx_addto_baw(struct ath_atx_tid *tid, struct ath_buf *bf)
 {
        struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
        u16 seqno = bf->bf_state.seqno;
@@ -452,9 +449,8 @@ static struct ath_buf* ath_clone_txbuf(struct ath_softc *sc, struct ath_buf *bf)
        return tbf;
 }
 
-static void ath_tx_count_frames(struct ath_softc *sc, struct ath_buf *bf,
-                               struct ath_tx_status *ts, int txok,
-                               int *nframes, int *nbad)
+static void ath_tx_count_frames(struct ath_buf *bf, struct ath_tx_status *ts,
+                               int txok, int *nframes, int *nbad)
 {
        u16 seq_st = 0;
        u32 ba[WME_BA_BMP_SIZE >> 5];
@@ -568,7 +564,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
        __skb_queue_head_init(&bf_pending);
 
-       ath_tx_count_frames(sc, bf, ts, txok, &nframes, &nbad);
+       ath_tx_count_frames(bf, ts, txok, &nframes, &nbad);
        while (bf) {
                u16 seqno = bf->bf_state.seqno;
 
@@ -621,7 +617,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                         * complete the acked-ones/xretried ones; update
                         * block-ack window
                         */
-                       ath_tx_update_baw(sc, tid, bf);
+                       ath_tx_update_baw(tid, bf);
 
                        if (rc_update && (acked_cnt == 1 || txfail_cnt == 1)) {
                                memcpy(tx_info->control.rates, rates, sizeof(rates));
@@ -651,7 +647,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                                 * run out of tx buf.
                                 */
                                if (!tbf) {
-                                       ath_tx_update_baw(sc, tid, bf);
+                                       ath_tx_update_baw(tid, bf);
 
                                        ath_tx_complete_buf(sc, bf, txq,
                                                            &bf_head, NULL, ts,
@@ -752,7 +748,7 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
        sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2);
        if (sta) {
                struct ath_node *an = (struct ath_node *)sta->drv_priv;
-               tid = ath_get_skb_tid(sc, an, bf->bf_mpdu);
+               tid = ath_get_skb_tid(an, bf->bf_mpdu);
                ath_tx_count_airtime(sc, sta, bf, ts, tid->tidno);
                if (ts->ts_status & (ATH9K_TXERR_FILT | ATH9K_TXERR_XRETRY))
                        tid->clear_ps_filter = true;
@@ -1012,13 +1008,13 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
 
                        INIT_LIST_HEAD(&bf_head);
                        list_add(&bf->list, &bf_head);
-                       ath_tx_update_baw(sc, tid, bf);
+                       ath_tx_update_baw(tid, bf);
                        ath_tx_complete_buf(sc, bf, txq, &bf_head, NULL, &ts, 0);
                        continue;
                }
 
                if (bf_isampdu(bf))
-                       ath_tx_addto_baw(sc, tid, bf);
+                       ath_tx_addto_baw(tid, bf);
 
                break;
        }
@@ -1114,8 +1110,8 @@ finish:
  * width  - 0 for 20 MHz, 1 for 40 MHz
  * half_gi - to use 4us v/s 3.6 us for symbol time
  */
-u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, int pktlen,
-                    int width, int half_gi, bool shortPreamble)
+u32 ath_pkt_duration(u8 rix, int pktlen, int width,
+                    int half_gi, bool shortPreamble)
 {
        u32 nbits, nsymbits, duration, nsymbols;
        int streams;
@@ -1327,7 +1323,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf,
                        info->rates[i].Rate = rix | 0x80;
                        info->rates[i].ChSel = ath_txchainmask_reduction(sc,
                                        ah->txchainmask, info->rates[i].Rate);
-                       info->rates[i].PktDuration = ath_pkt_duration(sc, rix, len,
+                       info->rates[i].PktDuration = ath_pkt_duration(rix, len,
                                 is_40, is_sgi, is_sp);
                        if (rix < 8 && (tx_info->flags & IEEE80211_TX_CTL_STBC))
                                info->rates[i].RateFlags |= ATH9K_RATESERIES_STBC;
@@ -2122,7 +2118,7 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
        bf->bf_state.bf_type = 0;
        if (tid && (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {
                bf->bf_state.bf_type = BUF_AMPDU;
-               ath_tx_addto_baw(sc, tid, bf);
+               ath_tx_addto_baw(tid, bf);
        }
 
        bf->bf_next = NULL;
@@ -2368,7 +2364,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
 
        if (txctl->sta) {
                an = (struct ath_node *) sta->drv_priv;
-               tid = ath_get_skb_tid(sc, an, skb);
+               tid = ath_get_skb_tid(an, skb);
        }
 
        ath_txq_lock(sc, txq);