From 27c4a9bb9628e7d892de0b5fa80def9cc1894608 Mon Sep 17 00:00:00 2001 From: John Whitmore Date: Mon, 16 Jul 2018 20:04:49 +0100 Subject: [PATCH] staging:rtl8192u: Rename InactTimer > inact_timer - Style Rename the struct TS_COMMON_INFO member InactTimer to inact_timer. This change clears the checkpatch issue with CamelCase naming. The change should not have any impact on runtime execution. 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 | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h index 2638456..1613c3c 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h @@ -18,7 +18,7 @@ enum tr_select { struct ts_common_info { struct list_head list; struct timer_list setup_timer; - struct timer_list InactTimer; + struct timer_list inact_timer; u8 Addr[6]; TSPEC_BODY TSpec; QOS_TCLAS TClass[TCLAS_NUM]; diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c index efe8392..175d912 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c @@ -148,7 +148,7 @@ void TSInitialize(struct ieee80211_device *ieee) // DLS related timer will be add here in the future!! timer_setup(&pTxTS->TsCommonInfo.setup_timer, TsSetupTimeOut, 0); - timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout, + timer_setup(&pTxTS->TsCommonInfo.inact_timer, TsInactTimeout, 0); timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0); timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut, @@ -169,7 +169,7 @@ void TSInitialize(struct ieee80211_device *ieee) INIT_LIST_HEAD(&pRxTS->RxPendingPktList); timer_setup(&pRxTS->TsCommonInfo.setup_timer, TsSetupTimeOut, 0); - timer_setup(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout, + timer_setup(&pRxTS->TsCommonInfo.inact_timer, TsInactTimeout, 0); timer_setup(&pRxTS->RxAdmittedBARecord.Timer, RxBaInactTimeout, 0); @@ -194,10 +194,10 @@ static void AdmitTS(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo, u32 InactTime) { del_timer_sync(&pTsCommonInfo->setup_timer); - del_timer_sync(&pTsCommonInfo->InactTimer); + del_timer_sync(&pTsCommonInfo->inact_timer); if(InactTime!=0) - mod_timer(&pTsCommonInfo->InactTimer, + mod_timer(&pTsCommonInfo->inact_timer, jiffies + msecs_to_jiffies(InactTime)); } @@ -413,7 +413,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info * //u32 flags = 0; unsigned long flags = 0; del_timer_sync(&pTs->setup_timer); - del_timer_sync(&pTs->InactTimer); + del_timer_sync(&pTs->inact_timer); TsInitDelBA(ieee, pTs, TxRxSelect); if(TxRxSelect == RX_DIR) { -- 2.7.4