staging: rtl8192e: Rename CamelCase variables in rtl_core
cover staging: rtl8192e: Rename CamelCase variables in rtl_core
Rename CamelCase variables in rtl_core.c and friends to avoid CamelCase which is not accepted by checkpatch.pl.
Tested with rtl8192e
Transferred this patch over wlan connection of rtl8192e
Philipp Hortmann (8):
staging: rtl8192e: Rename ChangeSource
staging: rtl8192e: Rename bActionAllowed
staging: rtl8192e: Rename bConnectBySSID
staging: rtl8192e: Rename rtState
staging: rtl8192e: Rename RFWaitCounter
staging: rtl8192e: Rename RFChangeInProgress
staging: rtl8192e: Rename bHwRadioOff
staging: rtl8192e: Rename CurSlotTime
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 6 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 84 ++++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +-- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 22 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 52 ++++++------ 6 files changed, 90 insertions(+), 90 deletions(-)
Signature · 1 line
2.37.2
PATCH 1/8 staging: rtl8192e: Rename ChangeSource
Rename variable ChangeSource to change_source to avoid CamelCase which is not accepted by checkpatch.pl.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +8 -8
@@ -133,7 +133,7 @@ void rtl92e_writew(struct net_device *dev, int x, u16 y)****************************************************************************/ bool rtl92e_set_rf_state (struct net_device *dev,enum rt_rf_power_state state_to_set, -RT_RF_CHANGE_SOURCE ChangeSource) +RT_RF_CHANGE_SOURCE change_source) {struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_device *ieee = priv->rtllib;
@@ -170,9 +170,9 @@ bool rtl92e_set_rf_state(struct net_device *dev,switch (state_to_set) {case eRfOn: - priv->rtllib->RfOffReason &= (~ChangeSource); + priv->rtllib->RfOffReason &= (~change_source); -if ((ChangeSource ==RF_CHANGE_BY_HW ) && priv->bHwRadioOff) +if ((change_source ==RF_CHANGE_BY_HW ) && priv->bHwRadioOff) priv->bHwRadioOff = false;if (!priv->rtllib->RfOffReason) {
@@ -180,7 +180,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, bActionAllowed = true;if (rtState == eRfOff && - ChangeSource >=RF_CHANGE_BY_HW ) + change_source >=RF_CHANGE_BY_HW ) bConnectBySSID = true; }break ;
@@ -190,7 +190,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,if ((priv->rtllib->iw_mode ==IW_MODE_INFRA ) || (priv->rtllib->iw_mode ==IW_MODE_ADHOC )) {if ((priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) || - (ChangeSource >RF_CHANGE_BY_IPS )) { + (change_source >RF_CHANGE_BY_IPS )) {if (ieee->state ==RTLLIB_LINKED ) priv->blinked_ingpio = true;else
@@ -199,14 +199,14 @@ bool rtl92e_set_rf_state(struct net_device *dev, WLAN_REASON_DISASSOC_STA_HAS_LEFT); } } -if ((ChangeSource ==RF_CHANGE_BY_HW ) && !priv->bHwRadioOff) +if ((change_source ==RF_CHANGE_BY_HW ) && !priv->bHwRadioOff) priv->bHwRadioOff = true; - priv->rtllib->RfOffReason |= ChangeSource; + priv->rtllib->RfOffReason |= change_source; bActionAllowed = true;break ;case eRfSleep: - priv->rtllib->RfOffReason |= ChangeSource; + priv->rtllib->RfOffReason |= change_source; bActionAllowed = true;break ;
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +1 -1
@@ -599,5 +599,5 @@ bool rtl92e_disable_nic(struct net_device *dev);bool rtl92e_set_rf_state (struct net_device *dev,enum rt_rf_power_state state_to_set, -RT_RF_CHANGE_SOURCE ChangeSource); +RT_RF_CHANGE_SOURCE change_source);#endif
Signature · 1 line
2.37.2
PATCH 2/8 staging: rtl8192e: Rename bActionAllowed
In reply to Philipp HortmannRename variable bActionAllowed to action_allowed to avoid CamelCase which is not accepted by checkpatch.pl.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +6 -6
@@ -137,7 +137,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, {struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_device *ieee = priv->rtllib; -bool bActionAllowed = false; +bool action_allowed = false;bool bConnectBySSID = false;enum rt_rf_power_state rtState;u16 RFWaitCounter =0 ;
@@ -177,7 +177,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,if (!priv->rtllib->RfOffReason) { priv->rtllib->RfOffReason =0 ; - bActionAllowed = true; + action_allowed = true;if (rtState == eRfOff && change_source >=RF_CHANGE_BY_HW )
@@ -202,19 +202,19 @@ bool rtl92e_set_rf_state(struct net_device *dev,if ((change_source ==RF_CHANGE_BY_HW ) && !priv->bHwRadioOff) priv->bHwRadioOff = true; priv->rtllib->RfOffReason |= change_source; - bActionAllowed = true; + action_allowed = true;break ;case eRfSleep: priv->rtllib->RfOffReason |= change_source; - bActionAllowed = true; + action_allowed = true;break ;default :break ; } -if (bActionAllowed) { +if (action_allowed) {rtl92e_set_rf_power_state (dev, state_to_set);if (state_to_set == eRfOn) {if (bConnectBySSID && priv->blinked_ingpio) {
@@ -228,7 +228,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,spin_lock_irqsave (&priv->rf_ps_lock, flag); priv->RFChangeInProgress = false;spin_unlock_irqrestore (&priv->rf_ps_lock, flag); -return bActionAllowed; +return action_allowed; }static short _rtl92e_check_nic_enough_desc (struct net_device *dev,int prio)
Signature · 1 line
2.37.2
PATCH 3/8 staging: rtl8192e: Rename bConnectBySSID
In reply to Philipp HortmannRename variable bConnectBySSID to connect_by_ssid to avoid CamelCase which is not accepted by checkpatch.pl.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -3
@@ -138,7 +138,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_device *ieee = priv->rtllib;bool action_allowed = false; -bool bConnectBySSID = false; +bool connect_by_ssid = false;enum rt_rf_power_state rtState;u16 RFWaitCounter =0 ;unsigned long flag;
@@ -181,7 +181,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,if (rtState == eRfOff && change_source >=RF_CHANGE_BY_HW ) - bConnectBySSID = true; + connect_by_ssid = true; }break ;
@@ -217,7 +217,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,if (action_allowed) {rtl92e_set_rf_power_state (dev, state_to_set);if (state_to_set == eRfOn) { -if (bConnectBySSID && priv->blinked_ingpio) { +if (connect_by_ssid && priv->blinked_ingpio) {schedule_delayed_work ( &ieee->associate_procedure_wq,0 ); priv->blinked_ingpio = false;
Signature · 1 line
2.37.2
PATCH 4/8 staging: rtl8192e: Rename rtState
In reply to Philipp HortmannRename variable rtState to rt_state to avoid CamelCase which is not accepted by checkpatch.pl.
--- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 18 +++++++++--------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +3 -3
@@ -86,11 +86,11 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,u16 usConfig =0 ;u8 i;struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv (dev); -enum rt_rf_power_state rtState; +enum rt_rf_power_state rt_state; - rtState = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->eRFPowerState;if (priv->rtllib->PowerSaveControl.bInactivePs) { -if (rtState == eRfOff) { +if (rt_state == eRfOff) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) {netdev_warn (dev,"%s(): RF is OFF.\n" , __func__);
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -3
@@ -139,7 +139,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,struct rtllib_device *ieee = priv->rtllib;bool action_allowed = false;bool connect_by_ssid = false; -enum rt_rf_power_state rtState; +enum rt_rf_power_state rt_state;u16 RFWaitCounter =0 ;unsigned long flag;
@@ -166,7 +166,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, } } - rtState = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->eRFPowerState;switch (state_to_set) {case eRfOn:
@@ -179,7 +179,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, priv->rtllib->RfOffReason =0 ; action_allowed = true; -if (rtState == eRfOff && +if (rt_state == eRfOff && change_source >=RF_CHANGE_BY_HW ) connect_by_ssid = true; }
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +9 -9
@@ -126,11 +126,11 @@ void rtl92e_ips_enter(struct net_device *dev)struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) &(priv->rtllib->PowerSaveControl); -enum rt_rf_power_state rtState; +enum rt_rf_power_state rt_state;if (pPSC->bInactivePs) { - rtState = priv->rtllib->eRFPowerState; -if (rtState == eRfOn && !pPSC->bSwRfProcessing && + rt_state = priv->rtllib->eRFPowerState; +if (rt_state == eRfOn && !pPSC->bSwRfProcessing && (priv->rtllib->state !=RTLLIB_LINKED ) && (priv->rtllib->iw_mode !=IW_MODE_MASTER )) {RT_TRACE (COMP_PS ,"%s(): Turn off RF.\n" , __func__);
@@ -147,11 +147,11 @@ void rtl92e_ips_leave(struct net_device *dev)struct r8192_priv *priv =rtllib_priv (dev);struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *) &(priv->rtllib->PowerSaveControl); -enum rt_rf_power_state rtState; +enum rt_rf_power_state rt_state;if (pPSC->bInactivePs) { - rtState = priv->rtllib->eRFPowerState; -if (rtState != eRfOn && !pPSC->bSwRfProcessing && + rt_state = priv->rtllib->eRFPowerState; +if (rt_state != eRfOn && !pPSC->bSwRfProcessing && priv->rtllib->RfOffReason <=RF_CHANGE_BY_IPS ) {RT_TRACE (COMP_PS ,"%s(): Turn on RF.\n" , __func__); pPSC->eInactivePowerState = eRfOn;
@@ -176,12 +176,12 @@ void rtl92e_ips_leave_wq(void *data)void rtl92e_rtllib_ips_leave_wq (struct net_device *dev) {struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv (dev); -enum rt_rf_power_state rtState; +enum rt_rf_power_state rt_state; - rtState = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->eRFPowerState;if (priv->rtllib->PowerSaveControl.bInactivePs) { -if (rtState == eRfOff) { +if (rt_state == eRfOff) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) {netdev_warn (dev,"%s(): RF is OFF.\n" , __func__);
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +6 -6
@@ -247,17 +247,17 @@ static int _rtl92e_wx_set_mode(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_device *ieee =netdev_priv_rsl (dev); -enum rt_rf_power_state rtState; +enum rt_rf_power_state rt_state;int ret;if (priv->bHwRadioOff)return 0 ; - rtState = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->eRFPowerState;mutex_lock (&priv->wx_mutex);if (wrqu->mode ==IW_MODE_ADHOC || wrqu->mode ==IW_MODE_MONITOR || ieee->bNetPromiscuousMode) {if (priv->rtllib->PowerSaveControl.bInactivePs) { -if (rtState == eRfOff) { +if (rt_state == eRfOff) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) { netdev_warn(dev, "%s(): RF is OFF.\n",
@@ -379,7 +379,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, {struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_device *ieee = priv->rtllib; -enum rt_rf_power_state rtState; +enum rt_rf_power_state rt_state;int ret;if (!(ieee->softmac_features &IEEE_SOFTMAC_SCAN )) {
@@ -396,7 +396,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, __func__);return 0 ; } - rtState = priv->rtllib->eRFPowerState; + rt_state = priv->rtllib->eRFPowerState;if (!priv->up)return -ENETDOWN ;if (priv->rtllib->LinkDetectInfo.bBusyTraffic == true)
@@ -419,7 +419,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,if (priv->rtllib->state !=RTLLIB_LINKED ) {if (priv->rtllib->PowerSaveControl.bInactivePs) { -if (rtState == eRfOff) { +if (rt_state == eRfOff) {if (priv->rtllib->RfOffReason >RF_CHANGE_BY_IPS ) { netdev_warn(dev, "%s(): RF is OFF.\n",
Signature · 1 line
2.37.2
PATCH 5/8 staging: rtl8192e: Rename RFWaitCounter
In reply to Philipp HortmannRename variable RFWaitCounter to rf_wait_counter to avoid CamelCase which is not accepted by checkpatch.pl.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -3
@@ -140,7 +140,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,bool action_allowed = false;bool connect_by_ssid = false;enum rt_rf_power_state rt_state; -u16 RFWaitCounter =0 ; +u16 rf_wait_counter =0 ;unsigned long flag;while (true) {
@@ -149,10 +149,10 @@ bool rtl92e_set_rf_state(struct net_device *dev,spin_unlock_irqrestore (&priv->rf_ps_lock, flag);while (priv->RFChangeInProgress) { - RFWaitCounter++; + rf_wait_counter++;mdelay (1 ); -if (RFWaitCounter >100 ) { +if (rf_wait_counter >100 ) {netdev_warn (dev,"%s(): Timeout waiting for RF change.\n" , __func__);
Signature · 1 line
2.37.2
PATCH 6/8 staging: rtl8192e: Rename RFChangeInProgress
In reply to Philipp HortmannRename variable RFChangeInProgress to rf_change_in_progress to avoid CamelCase which is not accepted by checkpatch.pl.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 ++++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +12 -12
@@ -145,10 +145,10 @@ bool rtl92e_set_rf_state(struct net_device *dev,while (true) {spin_lock_irqsave (&priv->rf_ps_lock, flag); -if (priv->RFChangeInProgress) { +if (priv->rf_change_in_progress) {spin_unlock_irqrestore (&priv->rf_ps_lock, flag); -while (priv->RFChangeInProgress) { +while (priv->rf_change_in_progress) { rf_wait_counter++;mdelay (1 );
@@ -160,7 +160,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, } } }else { - priv->RFChangeInProgress = true; + priv->rf_change_in_progress = true;spin_unlock_irqrestore (&priv->rf_ps_lock, flag);break ; }
@@ -226,7 +226,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, }spin_lock_irqsave (&priv->rf_ps_lock, flag); - priv->RFChangeInProgress = false; + priv->rf_change_in_progress = false;spin_unlock_irqrestore (&priv->rf_ps_lock, flag);return action_allowed; }
@@ -755,7 +755,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf)rtllib_softmac_stop_protocol (priv->rtllib,0 , true);spin_lock_irqsave (&priv->rf_ps_lock, flags); -while (priv->RFChangeInProgress) { +while (priv->rf_change_in_progress) {spin_unlock_irqrestore (&priv->rf_ps_lock, flags);if (RFInProgressTimeOut >100 ) {spin_lock_irqsave (&priv->rf_ps_lock, flags);
@@ -765,11 +765,11 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf) RFInProgressTimeOut++;spin_lock_irqsave (&priv->rf_ps_lock, flags); } - priv->RFChangeInProgress = true; + priv->rf_change_in_progress = true;spin_unlock_irqrestore (&priv->rf_ps_lock, flags); priv->ops->stop_adapter (dev, false);spin_lock_irqsave (&priv->rf_ps_lock, flags); - priv->RFChangeInProgress = false; + priv->rf_change_in_progress = false;spin_unlock_irqrestore (&priv->rf_ps_lock, flags);udelay (100 ); memset(&priv->rtllib->current_network, 0,
@@ -883,7 +883,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) priv->isRFOff = false; priv->bInPowerSaveMode = false; priv->rtllib->RfOffReason =0 ; - priv->RFChangeInProgress = false; + priv->rf_change_in_progress = false; priv->bHwRfOffAction =0 ; priv->SetRFPowerStateInProgress = false; priv->rtllib->PowerSaveControl.bInactivePs = true;
@@ -1151,11 +1151,11 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) priv->ResetProgress =RESET_TYPE_SILENT ;spin_lock_irqsave (&priv->rf_ps_lock, flag); -if (priv->RFChangeInProgress) { +if (priv->rf_change_in_progress) {spin_unlock_irqrestore (&priv->rf_ps_lock, flag); goto END; } - priv->RFChangeInProgress = true; + priv->rf_change_in_progress = true; priv->bResetInProgress = true;spin_unlock_irqrestore (&priv->rf_ps_lock, flag);
@@ -1217,7 +1217,7 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) ieee->is_silent_reset =1 ;spin_lock_irqsave (&priv->rf_ps_lock, flag); - priv->RFChangeInProgress = false; + priv->rf_change_in_progress = false;spin_unlock_irqrestore (&priv->rf_ps_lock, flag);rtl92e_enable_hw_security_config (dev);
@@ -1403,7 +1403,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)spin_lock_irqsave (&priv->tx_lock, flags);if ((check_reset_cnt++ >=3 ) && (!ieee->is_roaming) && - (!priv->RFChangeInProgress) && (!pPSC->bSwRfProcessing)) { + (!priv->rf_change_in_progress) && (!pPSC->bSwRfProcessing)) { ResetType =_rtl92e_if_check_reset (dev); check_reset_cnt =3 ; }
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +1 -1
@@ -478,7 +478,7 @@ struct r8192_priv {bool bInPowerSaveMode;u8 bHwRfOffAction; -bool RFChangeInProgress; +bool rf_change_in_progress;bool SetRFPowerStateInProgress;bool bdisable_nic;
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +2 -2
@@ -21,7 +21,7 @@ static void _rtl92e_hw_sleep(struct net_device *dev)unsigned long flags =0 ;spin_lock_irqsave (&priv->rf_ps_lock, flags); -if (priv->RFChangeInProgress) { +if (priv->rf_change_in_progress) {spin_unlock_irqrestore (&priv->rf_ps_lock, flags);RT_TRACE (COMP_DBG ,"%s(): RF Change in progress!\n" , __func__);
@@ -48,7 +48,7 @@ void rtl92e_hw_wakeup(struct net_device *dev)unsigned long flags =0 ;spin_lock_irqsave (&priv->rf_ps_lock, flags); -if (priv->RFChangeInProgress) { +if (priv->rf_change_in_progress) {spin_unlock_irqrestore (&priv->rf_ps_lock, flags);RT_TRACE (COMP_DBG ,"%s(): RF Change in progress!\n" , __func__);
Signature · 1 line
2.37.2
PATCH 7/8 staging: rtl8192e: Rename bHwRadioOff
In reply to Philipp HortmannRename variable bHwRadioOff to hw_radio_off to avoid CamelCase which is not accepted by checkpatch.pl.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 40 ++++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +6 -6
@@ -172,8 +172,8 @@ bool rtl92e_set_rf_state(struct net_device *dev,case eRfOn: priv->rtllib->RfOffReason &= (~change_source); -if ((change_source ==RF_CHANGE_BY_HW ) && priv->bHwRadioOff) - priv->bHwRadioOff = false; +if ((change_source ==RF_CHANGE_BY_HW ) && priv->hw_radio_off) + priv->hw_radio_off = false;if (!priv->rtllib->RfOffReason) { priv->rtllib->RfOffReason =0 ;
@@ -199,8 +199,8 @@ bool rtl92e_set_rf_state(struct net_device *dev, WLAN_REASON_DISASSOC_STA_HAS_LEFT); } } -if ((change_source ==RF_CHANGE_BY_HW ) && !priv->bHwRadioOff) - priv->bHwRadioOff = true; +if ((change_source ==RF_CHANGE_BY_HW ) && !priv->hw_radio_off) + priv->hw_radio_off = true; priv->rtllib->RfOffReason |= change_source; action_allowed = true;break ;
@@ -878,7 +878,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)memset (&priv->InterruptLog,0 ,sizeof (struct log_int_8190 )); priv->RxCounter =0 ; priv->rtllib->wx_set_enc =0 ; - priv->bHwRadioOff = false; + priv->hw_radio_off = false; priv->RegRfOff = false; priv->isRFOff = false; priv->bInPowerSaveMode = false;
@@ -1292,7 +1292,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)bool bHigherBusyRxTraffic = false;bool bEnterPS = false; -if (!priv->up || priv->bHwRadioOff) +if (!priv->up || priv->hw_radio_off)return ;if (priv->rtllib->state >=RTLLIB_LINKED ) {
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +1 -1
@@ -392,7 +392,7 @@ struct r8192_priv {u16 ShortRetryLimit;u16 LongRetryLimit; -bool bHwRadioOff; +bool hw_radio_off;bool blinked_ingpio;u8 polling_timer_on;
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +5 -5
@@ -1819,15 +1819,15 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) eRfPowerStateToSet = (tmp1byte&BIT1 ) ? eRfOn : eRfOff; -if (priv->bHwRadioOff && (eRfPowerStateToSet == eRfOn)) { +if (priv->hw_radio_off && (eRfPowerStateToSet == eRfOn)) {RT_TRACE (COMP_RF ,"gpiochangeRF - HW Radio ON\n" );netdev_info (dev,"gpiochangeRF - HW Radio ON\n" ); - priv->bHwRadioOff = false; + priv->hw_radio_off = false; bActuallySet = true; - }else if (!priv->bHwRadioOff && (eRfPowerStateToSet == eRfOff)) { + }else if (!priv->hw_radio_off && (eRfPowerStateToSet == eRfOff)) {RT_TRACE (COMP_RF ,"gpiochangeRF - HW Radio OFF\n" );netdev_info (dev,"gpiochangeRF - HW Radio OFF\n" ); - priv->bHwRadioOff = true; + priv->hw_radio_off = true; bActuallySet = true; }
@@ -1835,7 +1835,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)mdelay (1000 ); priv->bHwRfOffAction =1 ;rtl92e_set_rf_state (dev, eRfPowerStateToSet,RF_CHANGE_BY_HW ); -if (priv->bHwRadioOff) +if (priv->hw_radio_off) argv[1 ] ="RFOFF" ;else argv[1 ] ="RFON" ;
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +20 -20
@@ -52,7 +52,7 @@ static int _rtl92e_wx_set_rate(struct net_device *dev,int ret;struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -71,7 +71,7 @@ static int _rtl92e_wx_set_rts(struct net_device *dev,int ret;struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -99,7 +99,7 @@ static int _rtl92e_wx_set_power(struct net_device *dev,int ret;struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) { +if (priv->hw_radio_off) {netdev_warn (dev,"%s(): Can't set Power: Radio is Off.\n" , __func__);return 0 ;
@@ -129,7 +129,7 @@ static int _rtl92e_wx_set_rawtx(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev);int ret; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -228,7 +228,7 @@ static int _rtl92e_wx_set_debug(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev);u8 c = *extra; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ; netdev_info(dev, "=====>%s(), *extra:%x, debugflag:%x\n", __func__,
@@ -250,7 +250,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev,enum rt_rf_power_state rt_state;int ret; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ; rt_state = priv->rtllib->eRFPowerState;mutex_lock (&priv->wx_mutex);
@@ -391,7 +391,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,return 0 ; } -if (priv->bHwRadioOff) { +if (priv->hw_radio_off) {netdev_info (dev,"================>%s(): hwradio off\n" , __func__);return 0 ;
@@ -473,7 +473,7 @@ static int _rtl92e_wx_get_scan(struct net_device *dev,if (!priv->up)return -ENETDOWN ; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -492,7 +492,7 @@ static int _rtl92e_wx_set_essid(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev);int ret; -if (priv->bHwRadioOff) { +if (priv->hw_radio_off) {netdev_info (dev,"=========>%s():hw radio off,or Rf state is eRfOff, return\n" , __func__);
@@ -560,7 +560,7 @@ static int _rtl92e_wx_set_freq(struct net_device *dev,int ret;struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -586,7 +586,7 @@ static int _rtl92e_wx_set_frag(struct net_device *dev, {struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;if (wrqu->frag.disabled)
@@ -622,7 +622,7 @@ static int _rtl92e_wx_set_wap(struct net_device *dev,int ret;struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -669,7 +669,7 @@ static int _rtl92e_wx_set_enc(struct net_device *dev, {0x00, 0x00, 0x00, 0x00, 0x00, 0x03} };int i; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;if (!priv->up)
@@ -754,7 +754,7 @@ static int _rtl92e_wx_set_scan_type(struct net_device *dev,int *parms = (int *)p;int mode = parms[0 ]; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ; priv->rtllib->active_scan = mode;
@@ -770,7 +770,7 @@ static int _rtl92e_wx_set_retry(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev);int err =0 ; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -843,7 +843,7 @@ static int _rtl92e_wx_set_sens(struct net_device *dev,short err =0 ; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -870,7 +870,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev);struct rtllib_device *ieee = priv->rtllib; -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -950,7 +950,7 @@ static int _rtl92e_wx_set_auth(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -967,7 +967,7 @@ static int _rtl92e_wx_set_mlme(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
@@ -984,7 +984,7 @@ static int _rtl92e_wx_set_gen_ie(struct net_device *dev,struct r8192_priv *priv =rtllib_priv (dev); -if (priv->bHwRadioOff) +if (priv->hw_radio_off)return 0 ;mutex_lock (&priv->wx_mutex);
Signature · 1 line
2.37.2
PATCH 8/8 staging: rtl8192e: Rename CurSlotTime
In reply to Philipp HortmannRename variable CurSlotTime to cur_slot_time to avoid CamelCase which is not accepted by checkpatch.pl.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +3 -3
@@ -304,17 +304,17 @@ static void _rtl92e_update_cap(struct net_device *dev, u16 cap)if (net->mode & (IEEE_G |IEEE_N_24G )) {u8 slot_time_val; -u8 CurSlotTime = priv->slot_time; +u8 cur_slot_time = priv->slot_time;if ((cap &WLAN_CAPABILITY_SHORT_SLOT_TIME ) && (!priv->rtllib->pHTInfo->bCurrentRT2RTLongSlotTime)) { -if (CurSlotTime !=SHORT_SLOT_TIME ) { +if (cur_slot_time !=SHORT_SLOT_TIME ) { slot_time_val =SHORT_SLOT_TIME ; priv->rtllib->SetHwRegHandler (dev,HW_VAR_SLOT_TIME , &slot_time_val); } }else { -if (CurSlotTime !=NON_SHORT_SLOT_TIME ) { +if (cur_slot_time !=NON_SHORT_SLOT_TIME ) { slot_time_val =NON_SHORT_SLOT_TIME ; priv->rtllib->SetHwRegHandler (dev,HW_VAR_SLOT_TIME , &slot_time_val);
Signature · 1 line
2.37.2