Staging: rtl8192e: Rename variable pTxTs

Rename variable pTxTs to ts to fix checkpatch warning Avoid CamelCase.

Signed-off-by: Tree Davies <tdavies@darkphysics.net>
Link: https://lore.kernel.org/r/20231127054305.148276-2-tdavies@darkphysics.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index b52b42ac0fc4ffbd821a9b37061fab26f26cee1d..497791a980ba649f46b2cee85b74619ff2ec63be 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -23,10 +23,10 @@ static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *ba
        del_timer_sync(&ba->timer);
 }
 
-static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *pTxTs)
+static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *ts)
 {
-       struct ba_record *admitted_ba = &pTxTs->TxAdmittedBARecord;
-       struct ba_record *pending_ba = &pTxTs->TxPendingBARecord;
+       struct ba_record *admitted_ba = &ts->TxAdmittedBARecord;
+       struct ba_record *pending_ba = &ts->TxPendingBARecord;
        u8 send_del_ba = false;
 
        if (pending_ba->b_valid) {
@@ -443,20 +443,20 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
 
                rx_ts_delete_ba(ieee, ts);
        } else {
-               struct tx_ts_record *pTxTs;
+               struct tx_ts_record *ts;
 
-               if (!rtllib_get_ts(ieee, (struct ts_common_info **)&pTxTs, dst,
+               if (!rtllib_get_ts(ieee, (struct ts_common_info **)&ts, dst,
                           (u8)pDelBaParamSet->field.tid, TX_DIR, false)) {
                        netdev_warn(ieee->dev, "%s(): can't get TS for TXTS\n",
                                    __func__);
                        return -1;
                }
 
-               pTxTs->using_ba = false;
-               pTxTs->add_ba_req_in_progress = false;
-               pTxTs->add_ba_req_delayed = false;
-               del_timer_sync(&pTxTs->TsAddBaTimer);
-               tx_ts_delete_ba(ieee, pTxTs);
+               ts->using_ba = false;
+               ts->add_ba_req_in_progress = false;
+               ts->add_ba_req_delayed = false;
+               del_timer_sync(&ts->TsAddBaTimer);
+               tx_ts_delete_ba(ieee, ts);
        }
        return 0;
 }
@@ -489,14 +489,14 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
                           enum tr_select TxRxSelect)
 {
        if (TxRxSelect == TX_DIR) {
-               struct tx_ts_record *pTxTs =
+               struct tx_ts_record *ts =
                         (struct tx_ts_record *)pTsCommonInfo;
 
-               if (tx_ts_delete_ba(ieee, pTxTs))
+               if (tx_ts_delete_ba(ieee, ts))
                        rtllib_send_DELBA(ieee, pTsCommonInfo->addr,
-                                         (pTxTs->TxAdmittedBARecord.b_valid) ?
-                                        (&pTxTs->TxAdmittedBARecord) :
-                                       (&pTxTs->TxPendingBARecord),
+                                         (ts->TxAdmittedBARecord.b_valid) ?
+                                        (&ts->TxAdmittedBARecord) :
+                                       (&ts->TxPendingBARecord),
                                         TxRxSelect, DELBA_REASON_END_BA);
        } else if (TxRxSelect == RX_DIR) {
                struct rx_ts_record *ts =
@@ -510,23 +510,23 @@ void rtllib_ts_init_del_ba(struct rtllib_device *ieee,
 
 void rtllib_ba_setup_timeout(struct timer_list *t)
 {
-       struct tx_ts_record *pTxTs = from_timer(pTxTs, t,
+       struct tx_ts_record *ts = from_timer(ts, t,
                                              TxPendingBARecord.timer);
 
-       pTxTs->add_ba_req_in_progress = false;
-       pTxTs->add_ba_req_delayed = true;
-       pTxTs->TxPendingBARecord.b_valid = false;
+       ts->add_ba_req_in_progress = false;
+       ts->add_ba_req_delayed = true;
+       ts->TxPendingBARecord.b_valid = false;
 }
 
 void rtllib_tx_ba_inact_timeout(struct timer_list *t)
 {
-       struct tx_ts_record *pTxTs = from_timer(pTxTs, t,
+       struct tx_ts_record *ts = from_timer(ts, t,
                                              TxAdmittedBARecord.timer);
-       struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device,
-                                    TxTsRecord[pTxTs->num]);
-       tx_ts_delete_ba(ieee, pTxTs);
-       rtllib_send_DELBA(ieee, pTxTs->TsCommonInfo.addr,
-                         &pTxTs->TxAdmittedBARecord, TX_DIR,
+       struct rtllib_device *ieee = container_of(ts, struct rtllib_device,
+                                    TxTsRecord[ts->num]);
+       tx_ts_delete_ba(ieee, ts);
+       rtllib_send_DELBA(ieee, ts->TsCommonInfo.addr,
+                         &ts->TxAdmittedBARecord, TX_DIR,
                          DELBA_REASON_TIMEOUT);
 }
 

diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 41c1e768348a55032d341a5808650fb03367c8d6..01d077bf0155720741a495fa352c7e52117ad3a4 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -82,12 +82,12 @@ static void RxPktPendingTimeout(struct timer_list *t)
 
 static void TsAddBaProcess(struct timer_list *t)
 {
-       struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TsAddBaTimer);
-       u8 num = pTxTs->num;
-       struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device,
+       struct tx_ts_record *ts = from_timer(ts, t, TsAddBaTimer);
+       u8 num = ts->num;
+       struct rtllib_device *ieee = container_of(ts, struct rtllib_device,
                                     TxTsRecord[num]);
 
-       rtllib_ts_init_add_ba(ieee, pTxTs, BA_POLICY_IMMEDIATE, false);
+       rtllib_ts_init_add_ba(ieee, ts, BA_POLICY_IMMEDIATE, false);
        netdev_dbg(ieee->dev, "%s(): ADDBA Req is started\n", __func__);
 }
 

diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 1da098f5b84ca343363c08b1ec94609204af11b6..2ef617a55995b06d62c6a7c6733e56c307c5059f 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -267,7 +267,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
                                    struct cb_desc *tcb_desc)
 {
        struct rt_hi_throughput *ht_info = ieee->ht_info;
-       struct tx_ts_record *pTxTs = NULL;
+       struct tx_ts_record *ts = NULL;
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
 
        if (rtllib_act_scanning(ieee, false))
@@ -289,25 +289,25 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee,
        if (!ieee->GetNmodeSupportBySecCfg(ieee->dev))
                return;
        if (ht_info->current_ampdu_enable) {
-               if (!rtllib_get_ts(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1,
+               if (!rtllib_get_ts(ieee, (struct ts_common_info **)(&ts), hdr->addr1,
                           skb->priority, TX_DIR, true)) {
                        netdev_info(ieee->dev, "%s: can't get TS\n", __func__);
                        return;
                }
-               if (!pTxTs->TxAdmittedBARecord.b_valid) {
+               if (!ts->TxAdmittedBARecord.b_valid) {
                        if (ieee->wpa_ie_len && (ieee->pairwise_key_type ==
                            KEY_TYPE_NA)) {
                                ;
                        } else if (tcb_desc->bdhcp == 1) {
                                ;
-                       } else if (!pTxTs->disable_add_ba) {
-                               TsStartAddBaProcess(ieee, pTxTs);
+                       } else if (!ts->disable_add_ba) {
+                               TsStartAddBaProcess(ieee, ts);
                        }
                        goto FORCED_AGG_SETTING;
-               } else if (!pTxTs->using_ba) {
-                       if (SN_LESS(pTxTs->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num,
-                                   (pTxTs->TxCurSeq + 1) % 4096))
-                               pTxTs->using_ba = true;
+               } else if (!ts->using_ba) {
+                       if (SN_LESS(ts->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num,
+                                   (ts->TxCurSeq + 1) % 4096))
+                               ts->using_ba = true;
                        else
                                goto FORCED_AGG_SETTING;
                }