staging: rtl8188eu: remove unnecessary parentheses in rtw_pwrctrl.c
PATCH 1/3 staging: rtl8188eu: remove unnecessary parentheses in rtw_pwrctrl.c
Remove unnecessary parentheses reported by checkpatch.
--- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +6 -6
@@ -154,8 +154,8 @@ void ips_enter(struct adapter *padapter)int ips_leave (struct adapter *padapter) {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct security_priv *psecuritypriv = &(padapter->securitypriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct security_priv *psecuritypriv = &padapter->securitypriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int result = _SUCCESS;int keyid;
@@ -200,7 +200,7 @@ int ips_leave(struct adapter *padapter)static bool rtw_pwr_unassociated_idle (struct adapter *adapter) { -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;bool ret = false;if (time_after_eq (adapter->pwrctrlpriv.ips_deny_time, jiffies))
@@ -221,7 +221,7 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)void rtw_ps_processor (struct adapter *padapter) {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;enum rt_rf_power_state rfpwrstate; pwrpriv->ps_processing = true;
@@ -336,7 +336,7 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) {unsigned long curr_time, delta_time;struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; curr_time = jiffies; delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp;
@@ -483,7 +483,7 @@ void LPS_Leave(struct adapter *padapter)/* */ void LeaveAllPowerSaveMode (struct adapter *Adapter) { -struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;u8 enqueue =0 ;if (check_fwstate (pmlmepriv, _FW_LINKED))
Signature · 1 line
2.24.0
PATCH 2/3 staging: rtl8188eu: cleanup declarations in rtw_pwrctrl.c
Replace tabs with spaces in declarations to cleanup whitespace.
--- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +8 -8
@@ -282,7 +282,7 @@ static void pwr_state_check_handler(struct timer_list *t)*/ void rtw_set_rpwm (struct adapter *padapter,u8 pslv) { -u8 rpwm; +u8 rpwm;struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; pslv =PS_STATE (pslv);
@@ -335,8 +335,8 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)static u8 PS_RDY_CHECK (struct adapter *padapter) {unsigned long curr_time, delta_time; -struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; curr_time = jiffies; delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp;
@@ -437,7 +437,7 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)/* */ void LPS_Enter (struct adapter *padapter) { -struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; +struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;if (!PS_RDY_CHECK (padapter))return ;
@@ -463,7 +463,7 @@ void LPS_Enter(struct adapter *padapter)/* Leave the leisure power save mode. */ void LPS_Leave (struct adapter *padapter) { -struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; +struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;if (pwrpriv->bLeisurePs) {if (pwrpriv->pwr_mode !=PS_MODE_ACTIVE ) {
@@ -483,8 +483,8 @@ void LPS_Leave(struct adapter *padapter)/* */ void LeaveAllPowerSaveMode (struct adapter *Adapter) { -struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; -u8 enqueue =0 ; +struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; +u8 enqueue =0 ;if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_lps_ctrl_wk_cmd (Adapter,LPS_CTRL_LEAVE , enqueue);
@@ -611,7 +611,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *calint rtw_pm_set_lps (struct adapter *padapter,u8 mode) { -int ret =0 ; +int ret =0 ;struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;if (mode <PS_MODE_NUM ) {
Signature · 1 line
2.24.0
Re: [PATCH 2/3] staging: rtl8188eu: cleanup declarations in rtw_pwrctrl.c
Quoted 6 lines · Michael Straube
Replace tabs with spaces in declarations to cleanup whitespace.
Signed-off-by Michael Straube <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
Thanks,
Larry
PATCH 3/3 staging: rtl8188eu: remove return variable from rtw_pwr_unassociated_idle
In reply to Michael StraubeFunction rtw_pwr_unassociated_idle returns boolean values. Remove the return variable ret and the exit label to simplify the function a little bit. Return true or false directly instead.
--- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +3 -7
@@ -201,21 +201,17 @@ int ips_leave(struct adapter *padapter)static bool rtw_pwr_unassociated_idle (struct adapter *adapter) {struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -bool ret = false;if (time_after_eq (adapter->pwrctrlpriv.ips_deny_time, jiffies)) - goto exit; +return false;if (check_fwstate (pmlmepriv,WIFI_ASOC_STATE |WIFI_SITE_MONITOR ) ||check_fwstate (pmlmepriv,WIFI_UNDER_LINKING |WIFI_UNDER_WPS ) ||check_fwstate (pmlmepriv,WIFI_AP_STATE ) ||check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE |WIFI_ADHOC_STATE )) - goto exit; - - ret = true; +return false; -exit: -return ret; +return true; }void rtw_ps_processor (struct adapter *padapter)
Signature · 1 line
2.24.0
Re: [PATCH 3/3] staging: rtl8188eu: remove return variable from rtw_pwr_unassociated_idle
Quoted 8 lines · Michael Straube
Function
rtw_pwr_unassociated_idlereturns boolean values. Remove the return variable ret and the exit label to simplify the function a little bit. Return true or false directly instead.Signed-off-by Michael Straube <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
Thanks,
Larry
Quoted 6 lines · Michael Straube
Remove unnecessary parentheses reported by checkpatch.
Signed-off-by Michael Straube <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Thanks,
Larry