From 36cf191fd45047cd30083c7e3aa4d3f7cd3f604a Mon Sep 17 00:00:00 2001 From: John Whitmore Date: Mon, 16 Jul 2018 20:04:48 +0100 Subject: [PATCH] staging:rtl8192u: rename SetupTimer > setup_timer - Style Rename the struct TS_COMMON_INFO member SetupTimer to setup_timer. This clears the checkpatch issue with CamelCase variable names. Signed-off-by: John Whitmore Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h index 0a0420aa91cf..26384566d4f3 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h @@ -17,7 +17,7 @@ enum tr_select { struct ts_common_info { struct list_head list; - struct timer_list SetupTimer; + struct timer_list setup_timer; struct timer_list InactTimer; u8 Addr[6]; TSPEC_BODY TSpec; diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c index 24abdad52ed6..efe8392043c1 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c @@ -146,7 +146,7 @@ void TSInitialize(struct ieee80211_device *ieee) pTxTS->num = count; // The timers for the operation of Traffic Stream and Block Ack. // DLS related timer will be add here in the future!! - timer_setup(&pTxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut, + timer_setup(&pTxTS->TsCommonInfo.setup_timer, TsSetupTimeOut, 0); timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout, 0); @@ -167,7 +167,7 @@ void TSInitialize(struct ieee80211_device *ieee) for(count = 0; count < TOTAL_TS_NUM; count++) { pRxTS->num = count; INIT_LIST_HEAD(&pRxTS->RxPendingPktList); - timer_setup(&pRxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut, + timer_setup(&pRxTS->TsCommonInfo.setup_timer, TsSetupTimeOut, 0); timer_setup(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout, 0); @@ -193,7 +193,7 @@ void TSInitialize(struct ieee80211_device *ieee) static void AdmitTS(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, u32 InactTime) { - del_timer_sync(&pTsCommonInfo->SetupTimer); + del_timer_sync(&pTsCommonInfo->setup_timer); del_timer_sync(&pTsCommonInfo->InactTimer); if(InactTime!=0) @@ -412,7 +412,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info * { //u32 flags = 0; unsigned long flags = 0; - del_timer_sync(&pTs->SetupTimer); + del_timer_sync(&pTs->setup_timer); del_timer_sync(&pTs->InactTimer); TsInitDelBA(ieee, pTs, TxRxSelect); -- 2.11.0