From: Larry Finger Date: Wed, 20 Jul 2011 00:31:37 +0000 (-0500) Subject: staging: rtl8192e: Convert typedef TR_SELECT to enum tr_select X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=39b2a4aed05d872a713e2fdbe5cfa535c75a173e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git staging: rtl8192e: Convert typedef TR_SELECT to enum tr_select Remove typedef from enum. Rename enum. Rename uses. Signed-off-by: Larry Finger --- diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index f82d577c37be..aeb8a4b5d058 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -140,7 +140,7 @@ static struct sk_buff* rtllib_DELBA( struct rtllib_device* ieee, u8* dst, struct ba_record *pBA, - TR_SELECT TxRxSelect, + enum tr_select TxRxSelect, u16 ReasonCode ) { @@ -220,7 +220,7 @@ void rtllib_send_ADDBARsp(struct rtllib_device* ieee, u8* dst, struct ba_record } -void rtllib_send_DELBA(struct rtllib_device* ieee, u8* dst, struct ba_record *pBA, TR_SELECT TxRxSelect, u16 ReasonCode) +void rtllib_send_DELBA(struct rtllib_device* ieee, u8* dst, struct ba_record *pBA, enum tr_select TxRxSelect, u16 ReasonCode) { struct sk_buff *skb = NULL; skb = rtllib_DELBA(ieee, dst, pBA, TxRxSelect, ReasonCode); @@ -527,7 +527,7 @@ TsInitAddBA( } void -TsInitDelBA( struct rtllib_device* ieee, struct ts_common_info *pTsCommonInfo, TR_SELECT TxRxSelect) +TsInitDelBA( struct rtllib_device* ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect) { if (TxRxSelect == TX_DIR) diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h index 279b1cc9a2dd..b4bebab36327 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -26,10 +26,10 @@ #define TOTAL_TS_NUM 16 #define TCLAS_NUM 4 -typedef enum _TR_SELECT { +enum tr_select { TX_DIR = 0, RX_DIR = 1, -} TR_SELECT, *PTR_SELECT; +}; struct ts_common_info { struct list_head List; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 6cec575d8d24..a6dbd26c6910 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -219,7 +219,7 @@ void AdmitTS(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, u } -struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee, u8* Addr, u8 TID, TR_SELECT TxRxSelect) +struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee, u8* Addr, u8 TID, enum tr_select TxRxSelect) { u8 dir; bool search_dir[4] = {0, 0, 0, 0}; @@ -321,7 +321,7 @@ bool GetTs( struct ts_common_info **ppTS, u8* Addr, u8 TID, - TR_SELECT TxRxSelect, + enum tr_select TxRxSelect, bool bAddNewTs) { u8 UP = 0; @@ -435,7 +435,7 @@ bool GetTs( void RemoveTsEntry( struct rtllib_device* ieee, struct ts_common_info *pTs, - TR_SELECT TxRxSelect + enum tr_select TxRxSelect ) { del_timer_sync(&pTs->SetupTimer); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index a1c96e63ba11..9dc15b8d6d3c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2907,7 +2907,7 @@ extern int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb); extern int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb); extern int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb); extern void TsInitAddBA( struct rtllib_device* ieee, struct tx_ts_record *pTS, u8 Policy, u8 bOverwritePending); -extern void TsInitDelBA( struct rtllib_device* ieee, struct ts_common_info *pTsCommonInfo, TR_SELECT TxRxSelect); +extern void TsInitDelBA( struct rtllib_device* ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect); extern void BaSetupTimeOut(unsigned long data); extern void TxBaInactTimeout(unsigned long data); extern void RxBaInactTimeout(unsigned long data); @@ -2917,7 +2917,7 @@ extern bool GetTs( struct ts_common_info **ppTS, u8* Addr, u8 TID, - TR_SELECT TxRxSelect, + enum tr_select TxRxSelect, bool bAddNewTs ); extern void TSInitialize(struct rtllib_device *ieee);