staging: rtl8723bs: cleanup LPS_RF_ON_check
cover staging: rtl8723bs: cleanup LPS_RF_ON_check
This series cleans up LPS_RF_ON_check().
Patch 1 simplifies the control flow by removing the err + break pattern and using direct returns.
Patch 2 converts the function to use standard kernel error codes.
No functional changes intended.
Hungyu Lin (2):
staging: rtl8723bs: simplify LPS_RF_ON_check control flow
staging: rtl8723bs: convert LPS_RF_ON_check to errno
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 26 +++++++------------ .../staging/rtl8723bs/include/rtw_pwrctrl.h | 2 +- 2 files changed, 11 insertions(+), 17 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 staging: rtl8723bs: simplify LPS_RF_ON_check control flow
Replace err + break pattern with direct returns to simplify the control flow and improve readability.
No functional change intended.
--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 24 ++++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +9 -15
@@ -389,35 +389,29 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode,/* * Return: -*0: Leave OK -*-1: Timeout -*-2: Other error +* 0: Leave OK +* -1: Timeout +* -2: Other error */ s32 LPS_RF_ON_check (struct adapter *padapter,u32 delay_ms) {unsigned long start_time;u8 bAwake = false; -s32 err =0 ; start_time = jiffies;while (1 ) {rtw_hal_get_hwreg (padapter,HW_VAR_FWLPS_RF_ON , &bAwake);if (bAwake) -break ; +return 0 ; -if (padapter->bSurpriseRemoved) { - err =-2 ; -break ; - } +if (padapter->bSurpriseRemoved) +return -2 ; + +if (jiffies_to_msecs (jiffies - start_time) > delay_ms) +return -1 ; -if (jiffies_to_msecs (jiffies - start_time) > delay_ms) { - err =-1 ; -break ; - }msleep (1 ); } - -return err; }/* Description: Enter the leisure power save mode. */
Signature · 1 line
2.34.1
PATCH 2/2 staging: rtl8723bs: convert LPS_RF_ON_check to errno
Convert LPS_RF_ON_check() to return standard kernel error codes.
Replace -1 and -2 with -ETIMEDOUT and -ENODEV respectively.
No functional change intended as callers currently ignore the return value.
--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 10 +++++----- drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +5 -5
@@ -390,10 +390,10 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode,/* * Return: * 0: Leave OK -* -1: Timeout -* -2: Other error +* -ETIMEDOUT: Timeout +* -ENODEV: Other error */ -s32 LPS_RF_ON_check (struct adapter *padapter,u32 delay_ms) +int LPS_RF_ON_check (struct adapter *padapter,u32 delay_ms) {unsigned long start_time;u8 bAwake = false;
@@ -405,10 +405,10 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)return 0 ;if (padapter->bSurpriseRemoved) -return -2 ; +return -ENODEV ;if (jiffies_to_msecs (jiffies - start_time) > delay_ms) -return -1 ; +return -ETIMEDOUT ;msleep (1 ); }
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h +1 -1
@@ -233,7 +233,7 @@ int ips_leave(struct adapter *padapter);void rtw_ps_processor (struct adapter *padapter); -s32 LPS_RF_ON_check (struct adapter *padapter,u32 delay_ms); +int LPS_RF_ON_check (struct adapter *padapter,u32 delay_ms);void LPS_Enter (struct adapter *padapter,const char *msg);void LPS_Leave (struct adapter *padapter,const char *msg);void traffic_check_for_leave_lps (struct adapter *padapter,u8 tx,u32 tx_packets);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerRe: [PATCH 1/2] staging: rtl8723bs: simplify LPS_RF_ON_check control flow
In reply to Hungyu LinQuoted 15 lines · Hungyu Lin
Replace err + break pattern with direct returns to simplify the control flow and improve readability.
No functional change intended.
Signed-off-by Hungyu Lin <[email protected]>--- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 24 ++++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-)drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +0
-0
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, · line 395
Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +3
-3@@ -389,35 +389,29 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode,/* * Return: -*0: Leave OK -*-1: Timeout -*-2: Other error +* 0: Leave OK +* -1: Timeout +* -2: Other error */
This change was not documented above, and doesn't belong in this patch :(