staging:rtl8192u: Remove typedef and rename TX_TS_RECORD - Style

Remove the typdef from structure TX_TS_RECORD and rename to tx_ts_record.
The removal of the typedef clears the checkpatch issue with creating new
types in code. The name change, whilst not specifically flagged by
checkpatch, is an issue since types are meant to be named in lowercase.

These changes are purely coding style changes and should have no impact
on runtime execution.

Signed-off-by: John Whitmore <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index bb4bb68bb3ddf6dbd35562bbf5ec2e3645e5f54b..aecb697f3729e9d5ab285ce665bf3c040ac93397 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -1646,7 +1646,7 @@ struct ieee80211_device {
        struct list_head                Tx_TS_Admit_List;
        struct list_head                Tx_TS_Pending_List;
        struct list_head                Tx_TS_Unused_List;
-       TX_TS_RECORD            TxTsRecord[TOTAL_TS_NUM];
+       struct tx_ts_record             TxTsRecord[TOTAL_TS_NUM];
        // 802.11e and WMM Traffic Stream Info (RX)
        struct list_head                Rx_TS_Admit_List;
        struct list_head                Rx_TS_Pending_List;
@@ -2388,7 +2388,7 @@ u16 TxCountToDataRate(struct ieee80211_device *ieee, u8 nDataRate);
 int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb);
 int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb);
 int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb);
-void TsInitAddBA(struct ieee80211_device *ieee, PTX_TS_RECORD pTS,
+void TsInitAddBA(struct ieee80211_device *ieee, struct tx_ts_record *pTS,
                 u8 Policy, u8 bOverwritePending);
 void TsInitDelBA(struct ieee80211_device *ieee,
                 struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect);
@@ -2406,7 +2406,7 @@ bool GetTs(
        bool                            bAddNewTs
        );
 void TSInitialize(struct ieee80211_device *ieee);
-void TsStartAddBaProcess(struct ieee80211_device *ieee, PTX_TS_RECORD   pTxTS);
+void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record   *pTxTS);
 void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr);
 void RemoveAllTS(struct ieee80211_device *ieee);
 void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index 010b53b458256ed2796982b780fcf825270bda3c..142b86b393dcb5d23cbdab8d2dcf3397ec551ab5 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -306,7 +306,7 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
                                       struct sk_buff *skb, struct cb_desc *tcb_desc)
 {
        PRT_HIGH_THROUGHPUT     pHTInfo = ieee->pHTInfo;
-       PTX_TS_RECORD                   pTxTs = NULL;
+       struct tx_ts_record        *pTxTs = NULL;
        struct rtl_80211_hdr_1addr *hdr = (struct rtl_80211_hdr_1addr *)skb->data;
 
        if (!pHTInfo->bCurrentHTSupport||!pHTInfo->bEnableHT)
@@ -584,7 +584,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee,
                return;
        if (IsQoSDataFrame(skb->data)) //we deal qos data only
        {
-               PTX_TS_RECORD pTS = NULL;
+               struct tx_ts_record *pTS = NULL;
                if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst, skb->priority, TX_DIR, true))
                {
                        return;

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 2c7d3ab1b5f7b2bbda4892a36591cc33c6b6962b..507014d44d54e3515d9f870a640acead157b8e8b 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -36,11 +36,11 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA)
 /********************************************************************************************************************
  *function: deactivete BA entry in Tx Ts, and send DELBA.
  *   input:
- *          PTX_TS_RECORD              pTxTs //Tx Ts which is to deactivate BA entry.
+ *          struct tx_ts_record *pTxTs //Tx Ts which is to deactivate BA entry.
  *  output:  none
- *  notice:  As PTX_TS_RECORD structure will be defined in QOS, so wait to be merged. //FIXME
+ *  notice:  As struct tx_ts_record * structure will be defined in QOS, so wait to be merged. //FIXME
  ********************************************************************************************************************/
-static u8 TxTsDeleteBA(struct ieee80211_device *ieee, PTX_TS_RECORD pTxTs)
+static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs)
 {
        PBA_RECORD              pAdmittedBa = &pTxTs->TxAdmittedBARecord;  //These two BA entries must exist in TS structure
        PBA_RECORD              pPendingBa = &pTxTs->TxPendingBARecord;
@@ -420,7 +420,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
 {
         struct rtl_80211_hdr_3addr *rsp = NULL;
        PBA_RECORD              pPendingBA, pAdmittedBA;
-       PTX_TS_RECORD           pTS = NULL;
+       struct tx_ts_record     *pTS = NULL;
        u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;
        u16 *pStatusCode = NULL, *pBaTimeoutVal = NULL;
        PBA_PARAM_SET           pBaParamSet = NULL;
@@ -581,7 +581,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
 
                RxTsDeleteBA(ieee, pRxTs);
        } else {
-               PTX_TS_RECORD   pTxTs;
+               struct tx_ts_record *pTxTs;
 
                if (!GetTs(
                        ieee,
@@ -610,7 +610,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
 void
 TsInitAddBA(
        struct ieee80211_device *ieee,
-       PTX_TS_RECORD   pTS,
+       struct tx_ts_record     *pTS,
        u8              Policy,
        u8              bOverwritePending
        )
@@ -641,7 +641,7 @@ void
 TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect)
 {
        if (TxRxSelect == TX_DIR) {
-               PTX_TS_RECORD   pTxTs = (PTX_TS_RECORD)pTsCommonInfo;
+               struct tx_ts_record *pTxTs = (struct tx_ts_record *)pTsCommonInfo;
 
                if (TxTsDeleteBA(ieee, pTxTs))
                        ieee80211_send_DELBA(
@@ -663,13 +663,13 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,
 }
 /********************************************************************************************************************
  *function:  BA setup timer
- *   input:  unsigned long      data           //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer
+ *   input:  unsigned long      data           //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer
  *  return:  NULL
  *  notice:
  ********************************************************************************************************************/
 void BaSetupTimeOut(struct timer_list *t)
 {
-       PTX_TS_RECORD   pTxTs = from_timer(pTxTs, t, TxPendingBARecord.Timer);
+       struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TxPendingBARecord.Timer);
 
        pTxTs->bAddBaReqInProgress = false;
        pTxTs->bAddBaReqDelayed = true;
@@ -678,7 +678,7 @@ void BaSetupTimeOut(struct timer_list *t)
 
 void TxBaInactTimeout(struct timer_list *t)
 {
-       PTX_TS_RECORD   pTxTs = from_timer(pTxTs, t, TxAdmittedBARecord.Timer);
+       struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TxAdmittedBARecord.Timer);
        struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[pTxTs->num]);
        TxTsDeleteBA(ieee, pTxTs);
        ieee80211_send_DELBA(

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index 3da1ef6ef1052c2cab6b24b41663b1b1209e6259..0f744b112dcfe2c64e43056a399d4d92c0e39bbe 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -26,7 +26,7 @@ struct ts_common_info {
        u8                              t_clas_num;
 };
 
-typedef struct _TX_TS_RECORD {
+struct tx_ts_record {
        struct ts_common_info           TsCommonInfo;
        u16                             TxCurSeq;
        BA_RECORD                       TxPendingBARecord;      /*  For BA Originator */
@@ -37,7 +37,7 @@ typedef struct _TX_TS_RECORD {
        u8                              bUsingBa;
        struct timer_list               TsAddBaTimer;
        u8                              num;
-} TX_TS_RECORD, *PTX_TS_RECORD;
+};
 
 typedef struct _RX_TS_RECORD {
        struct ts_common_info           TsCommonInfo;

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index 4b2da7f311664a1de56a33f7b0e6b1575ae55a55..f2a5771185f0d77d41728b911a71b12791af60e6 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -19,7 +19,7 @@ static void TsInactTimeout(struct timer_list *unused)
 
 /********************************************************************************************************************
  *function:  I still not understand this function, so wait for further implementation
- *   input:  unsigned long      data           //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer
+ *   input:  unsigned long      data           //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer
  *  return:  NULL
  *  notice:
  ********************************************************************************************************************/
@@ -86,13 +86,13 @@ static void RxPktPendingTimeout(struct timer_list *t)
 
 /********************************************************************************************************************
  *function:  Add BA timer function
- *   input:  unsigned long      data           //acturally we send TX_TS_RECORD or RX_TS_RECORD to these timer
+ *   input:  unsigned long      data           //acturally we send struct tx_ts_record or RX_TS_RECORD to these timer
  *  return:  NULL
  *  notice:
  ********************************************************************************************************************/
 static void TsAddBaProcess(struct timer_list *t)
 {
-       PTX_TS_RECORD   pTxTs = from_timer(pTxTs, t, TsAddBaTimer);
+       struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TsAddBaTimer);
        u8 num = pTxTs->num;
        struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[num]);
 
@@ -110,7 +110,7 @@ static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
        pTsCommonInfo->t_clas_num = 0;
 }
 
-static void ResetTxTsEntry(PTX_TS_RECORD pTS)
+static void ResetTxTsEntry(struct tx_ts_record *pTS)
 {
        ResetTsCommonInfo(&pTS->TsCommonInfo);
        pTS->TxCurSeq = 0;
@@ -131,7 +131,7 @@ static void ResetRxTsEntry(PRX_TS_RECORD pTS)
 
 void TSInitialize(struct ieee80211_device *ieee)
 {
-       PTX_TS_RECORD           pTxTS  = ieee->TxTsRecord;
+       struct tx_ts_record     *pTxTS  = ieee->TxTsRecord;
        PRX_TS_RECORD           pRxTS  = ieee->RxTsRecord;
        PRX_REORDER_ENTRY       pRxReorderEntry = ieee->RxReorderEntry;
        u8                              count = 0;
@@ -374,7 +374,7 @@ bool GetTs(
                                (*ppTS) = list_entry(pUnusedList->next, struct ts_common_info, list);
                                list_del_init(&(*ppTS)->list);
                                if(TxRxSelect==TX_DIR) {
-                                       PTX_TS_RECORD tmp = container_of(*ppTS, TX_TS_RECORD, TsCommonInfo);
+                                       struct tx_ts_record *tmp = container_of(*ppTS, struct tx_ts_record, TsCommonInfo);
                                        ResetTxTsEntry(tmp);
                                } else {
                                        PRX_TS_RECORD tmp = container_of(*ppTS, RX_TS_RECORD, TsCommonInfo);
@@ -447,7 +447,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
 
 //#endif
        } else {
-               PTX_TS_RECORD pTxTS = (PTX_TS_RECORD)pTs;
+               struct tx_ts_record *pTxTS = (struct tx_ts_record *)pTs;
                del_timer_sync(&pTxTS->TsAddBaTimer);
        }
 }
@@ -520,7 +520,7 @@ void RemoveAllTS(struct ieee80211_device *ieee)
        }
 }
 
-void TsStartAddBaProcess(struct ieee80211_device *ieee, PTX_TS_RECORD  pTxTS)
+void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record *pTxTS)
 {
        if(!pTxTS->bAddBaReqInProgress) {
                pTxTS->bAddBaReqInProgress = true;