staging:rtl8192u: remove typedef of struct TS_COMMON_INFO - Style

To clear a checkpatch issue removed the typedef of the structure
TS_COMMON_INFO.

This change removes the previous declaration, which defined two types, both
TS_COMMON_INFO and a pointer type PTS_COMMON_INFO:

typedef struct _TS_COMMON_INFO {
	...
} TS_COMMON_INFO, *PTS_COMMON_INFO;

The pointer type has been completely removed from the code, as:
"(so-called Hungarian notation) is brain damaged" according to the coding
standard.

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
index e65c9967b62779e346e1a86a1229fe1a9655916d..bb4bb68bb3ddf6dbd35562bbf5ec2e3645e5f54b 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
@@ -2391,7 +2391,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb);
 void TsInitAddBA(struct ieee80211_device *ieee, PTX_TS_RECORD pTS,
                 u8 Policy, u8 bOverwritePending);
 void TsInitDelBA(struct ieee80211_device *ieee,
-                PTS_COMMON_INFO pTsCommonInfo, enum tr_select TxRxSelect);
+                struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect);
 void BaSetupTimeOut(struct timer_list *t);
 void TxBaInactTimeout(struct timer_list *t);
 void RxBaInactTimeout(struct timer_list *t);
@@ -2399,7 +2399,7 @@ void ResetBaEntry(PBA_RECORD pBA);
 //function in TS.c
 bool GetTs(
        struct ieee80211_device         *ieee,
-       PTS_COMMON_INFO                 *ppTS,
+       struct ts_common_info           **ppTS,
        u8                              *Addr,
        u8                              TID,
        enum tr_select                  TxRxSelect,  //Rx:1, Tx:0

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 172165f4461a7361f7e00b2bc071069457fa9279..a84de8c52a2b4a2040686e81f5555512ab06fd8f 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -1021,7 +1021,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                        //IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): QOS ENABLE AND RECEIVE QOS DATA , we will get Ts, tid:%d\n",__func__, tid);
                if(GetTs(
                                ieee,
-                               (PTS_COMMON_INFO *) &pRxTS,
+                               (struct ts_common_info **) &pRxTS,
                                hdr->addr2,
                                Frame_QoSTID((u8 *)(skb->data)),
                                RX_DIR,
@@ -1266,7 +1266,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
        {
                TID = Frame_QoSTID(skb->data);
                SeqNum = WLAN_GET_SEQ_SEQ(sc);
-               GetTs(ieee,(PTS_COMMON_INFO *) &pTS,hdr->addr2,TID,RX_DIR,true);
+               GetTs(ieee,(struct ts_common_info **) &pTS,hdr->addr2,TID,RX_DIR,true);
                if (TID !=0 && TID !=3)
                {
                        ieee->bis_any_nonbepkts = true;

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index 9a1a84548bc62abbbde965435af0beb378a7c1e5..010b53b458256ed2796982b780fcf825270bda3c 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -330,7 +330,7 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
        }
        if(pHTInfo->bCurrentAMPDUEnable)
        {
-               if (!GetTs(ieee, (PTS_COMMON_INFO *)(&pTxTs), hdr->addr1, skb->priority, TX_DIR, true))
+               if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1, skb->priority, TX_DIR, true))
                {
                        printk("===>can't get TS\n");
                        return;
@@ -585,7 +585,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee,
        if (IsQoSDataFrame(skb->data)) //we deal qos data only
        {
                PTX_TS_RECORD pTS = NULL;
-               if (!GetTs(ieee, (PTS_COMMON_INFO *)(&pTS), dst, skb->priority, TX_DIR, true))
+               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 04779da803e41592763a2c45cf8364a85965e911..950f827a1740bee4c44cd1755e2a12aba98bac4b 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -360,7 +360,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
        // If there is no matched TS, reject the ADDBA request.
        if (!GetTs(
                        ieee,
-                       (PTS_COMMON_INFO *)(&pTS),
+                       (struct ts_common_info **)(&pTS),
                        dst,
                        (u8)(pBaParamSet->field.TID),
                        RX_DIR,
@@ -459,7 +459,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
        //
        if (!GetTs(
                        ieee,
-                       (PTS_COMMON_INFO *)(&pTS),
+                       (struct ts_common_info **)(&pTS),
                        dst,
                        (u8)(pBaParamSet->field.TID),
                        TX_DIR,
@@ -570,7 +570,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
 
                if (!GetTs(
                                ieee,
-                               (PTS_COMMON_INFO *)&pRxTs,
+                               (struct ts_common_info **)&pRxTs,
                                dst,
                                (u8)pDelBaParamSet->field.TID,
                                RX_DIR,
@@ -585,7 +585,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
 
                if (!GetTs(
                        ieee,
-                       (PTS_COMMON_INFO *)&pTxTs,
+                       (struct ts_common_info **)&pTxTs,
                        dst,
                        (u8)pDelBaParamSet->field.TID,
                        TX_DIR,
@@ -638,7 +638,7 @@ TsInitAddBA(
 }
 
 void
-TsInitDelBA(struct ieee80211_device *ieee, PTS_COMMON_INFO pTsCommonInfo, enum tr_select TxRxSelect)
+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;

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index c6a5ac1e647c1920aded873ab4fbd5c3217b1d62..5d2fb52a807229455da6fef1cc5118013ce76673 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -15,7 +15,7 @@ enum tr_select {
        RX_DIR = 1,
 };
 
-typedef struct _TS_COMMON_INFO {
+struct ts_common_info {
        struct list_head                List;
        struct timer_list               SetupTimer;
        struct timer_list               InactTimer;
@@ -24,10 +24,10 @@ typedef struct _TS_COMMON_INFO {
        QOS_TCLAS                       TClass[TCLAS_NUM];
        u8                              TClasProc;
        u8                              TClasNum;
-} TS_COMMON_INFO, *PTS_COMMON_INFO;
+};
 
 typedef struct _TX_TS_RECORD {
-       TS_COMMON_INFO          TsCommonInfo;
+       struct ts_common_info           TsCommonInfo;
        u16                             TxCurSeq;
        BA_RECORD                       TxPendingBARecord;      /*  For BA Originator */
        BA_RECORD                       TxAdmittedBARecord;     /*  For BA Originator */
@@ -40,7 +40,7 @@ typedef struct _TX_TS_RECORD {
 } TX_TS_RECORD, *PTX_TS_RECORD;
 
 typedef struct _RX_TS_RECORD {
-       TS_COMMON_INFO          TsCommonInfo;
+       struct ts_common_info           TsCommonInfo;
        u16                             RxIndicateSeq;
        u16                             RxTimeoutIndicateSeq;
        struct list_head                RxPendingPktList;

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index d6ba9201028fba35e78fc7b673dc37618ba74843..fd3347dca0254f513fab6e2f138a55ca3baa02d0 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -101,7 +101,7 @@ static void TsAddBaProcess(struct timer_list *t)
 }
 
 
-static void ResetTsCommonInfo(PTS_COMMON_INFO pTsCommonInfo)
+static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
 {
        eth_zero_addr(pTsCommonInfo->Addr);
        memset(&pTsCommonInfo->TSpec, 0, sizeof(TSPEC_BODY));
@@ -191,7 +191,7 @@ void TSInitialize(struct ieee80211_device *ieee)
 }
 
 static void AdmitTS(struct ieee80211_device *ieee,
-                   PTS_COMMON_INFO pTsCommonInfo, u32 InactTime)
+                   struct ts_common_info *pTsCommonInfo, u32 InactTime)
 {
        del_timer_sync(&pTsCommonInfo->SetupTimer);
        del_timer_sync(&pTsCommonInfo->InactTimer);
@@ -202,15 +202,15 @@ static void AdmitTS(struct ieee80211_device *ieee,
 }
 
 
-static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee,
-                                          u8 *Addr, u8 TID,
-                                          enum tr_select TxRxSelect)
+static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
+                                                 u8 *Addr, u8 TID,
+                                                 enum tr_select TxRxSelect)
 {
        //DIRECTION_VALUE       dir;
        u8      dir;
        bool                            search_dir[4] = {0};
        struct list_head                *psearch_list; //FIXME
-       PTS_COMMON_INFO pRet = NULL;
+       struct ts_common_info   *pRet = NULL;
        if(ieee->iw_mode == IW_MODE_MASTER) { //ap mode
                if(TxRxSelect == TX_DIR) {
                        search_dir[DIR_DOWN] = true;
@@ -264,7 +264,7 @@ static PTS_COMMON_INFO SearchAdmitTRStream(struct ieee80211_device *ieee,
                return NULL;
 }
 
-static void MakeTSEntry(PTS_COMMON_INFO pTsCommonInfo, u8 *Addr,
+static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr,
                        PTSPEC_BODY pTSPEC, PQOS_TCLAS pTCLAS, u8 TCLAS_Num,
                        u8 TCLAS_Proc)
 {
@@ -288,7 +288,7 @@ static void MakeTSEntry(PTS_COMMON_INFO pTsCommonInfo, u8 *Addr,
 
 bool GetTs(
        struct ieee80211_device         *ieee,
-       PTS_COMMON_INFO                 *ppTS,
+       struct ts_common_info           **ppTS,
        u8                              *Addr,
        u8                              TID,
        enum tr_select                  TxRxSelect,  //Rx:1, Tx:0
@@ -371,7 +371,7 @@ bool GetTs(
                                                                ((TxRxSelect==TX_DIR)?DIR_UP:DIR_DOWN);
                        IEEE80211_DEBUG(IEEE80211_DL_TS, "to add Ts\n");
                        if(!list_empty(pUnusedList)) {
-                               (*ppTS) = list_entry(pUnusedList->next, TS_COMMON_INFO, List);
+                               (*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);
@@ -407,7 +407,7 @@ bool GetTs(
        }
 }
 
-static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,
+static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *pTs,
                          enum tr_select TxRxSelect)
 {
        //u32 flags = 0;
@@ -454,7 +454,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, PTS_COMMON_INFO pTs,
 
 void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
 {
-       PTS_COMMON_INFO pTS, pTmpTS;
+       struct ts_common_info   *pTS, *pTmpTS;
 
        printk("===========>RemovePeerTS,%pM\n", Addr);
        list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
@@ -493,7 +493,7 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
 
 void RemoveAllTS(struct ieee80211_device *ieee)
 {
-       PTS_COMMON_INFO pTS, pTmpTS;
+       struct ts_common_info *pTS, *pTmpTS;
 
        list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) {
                RemoveTsEntry(ieee, pTS, TX_DIR);