[PATCH v2 0/2] staging: rtl8723bs: cleanup LPS_RF_ON_check

[PATCH v2 0/2] staging: rtl8723bs: cleanup LPS_RF_ON_check

[Hungyu Lin]

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.

v2:
 - Drop unrelated comment formatting changes from patch 1

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(-)

-- 
2.34.1

[PATCH v2 1/2] staging: rtl8723bs: simplify LPS_RF_ON_check control flow

[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 <dennylin0707@gmail.com>
---
v2:
 - Drop unrelated comment formatting changes

 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index ca1cb58fc801..56dbe0f36d65 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -397,27 +397,21 @@ 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. */
-- 
2.34.1

[PATCH v2 2/2] staging: rtl8723bs: convert LPS_RF_ON_check to errno

[Hungyu Lin]

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.

Signed-off-by: Hungyu Lin <dennylin0707@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c    | 12 ++++++------
 drivers/staging/rtl8723bs/include/rtw_pwrctrl.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 56dbe0f36d65..661d4a7eb797 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -389,11 +389,11 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode,
 
 /*
  * Return:
- *0:	Leave OK
- *-1:	Timeout
- *-2:	Other error
+ * 0:           Leave OK
+ * -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);
 	}
diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
index c27d07861b8c..7dc9c4e2dfd2 100644
--- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
@@ -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);
-- 
2.34.1