staging: r8188eu: remove macro rtw_pwr_wakeup()

PATCH New Michael Straube 1 participant 5 messages Apr 3, 2022 Staging

Share & tools

Michael Straube

author

2022-04-03 10:37 UTC #0 lore raw

cover staging: r8188eu: remove macro rtw_pwr_wakeup()

This series removes the rtw_pwr_wakeup() macro. It is actually just an alias for the _rtw_pwr_wakeup() function and can be removed to simplify the code.

Tested on x86_64 with Inter-Tech DMG-02.

Michael Straube (4):
staging: r8188eu: remove unused parameter from _rtw_pwr_wakeup()
staging: r8188eu: remove constant parameter from _rtw_pwr_wakeup()
staging: r8188eu: remove macro rtw_pwr_wakeup()
staging: r8188eu: clean up comment for rtw_pwr_wakeup()

 drivers/staging/r8188eu/core/rtw_pwrctrl.c    | 14 ++++++--------
 drivers/staging/r8188eu/include/rtw_pwrctrl.h |  5 +----
 2 files changed, 7 insertions(+), 12 deletions(-)

Signature · 1 line

2.35.1

Michael Straube

author

2022-04-03 10:37 UTC #1 lore raw

PATCH 1/4 staging: r8188eu: remove unused parameter from _rtw_pwr_wakeup()

The parameter 'caller' of _rtw_pwr_wakeup() is not used. Remove it.

Signed-off-by Michael Straube <[email protected]>

---
 drivers/staging/r8188eu/core/rtw_pwrctrl.c    | 2 +-
 drivers/staging/r8188eu/include/rtw_pwrctrl.h | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

drivers/staging/r8188eu/core/rtw_pwrctrl.c +1 -1

index 7beabf82eb92..08e8a5efba5e 100644
@@ -353,7 +353,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 * Return _SUCCESS or _FAIL
 */
 
-int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *caller)
+int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms)
 {
 	struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

drivers/staging/r8188eu/include/rtw_pwrctrl.h +2 -3

index 7c3cb895c3cd..0a0f7a4c4052 100644
@@ -121,10 +121,9 @@ s32 LPS_RF_ON_check(struct adapter *adapter, u32 delay_ms);
 void LPS_Enter(struct adapter *adapter);
 void LPS_Leave(struct adapter *adapter);
 
-int _rtw_pwr_wakeup(struct adapter *adapter, u32 ips_defer_ms,
-		    const char *caller);
+int _rtw_pwr_wakeup(struct adapter *adapter, u32 ips_defer_ms);
 #define rtw_pwr_wakeup(adapter)						\
-	 _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __func__)
+	 _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL)
 int rtw_pm_set_ips(struct adapter *adapter, u8 mode);
 int rtw_pm_set_lps(struct adapter *adapter, u8 mode);

Signature · 1 line

2.35.1

Michael Straube

author

2022-04-03 10:37 UTC #2 lore raw

PATCH 2/4 staging: r8188eu: remove constant parameter from _rtw_pwr_wakeup()

In reply to Michael Straube

The parameter 'ips_deffer_ms' of _rtw_pwr_wakeup() is always RTW_PWR_STATE_CHK_INTERVAL. Make it local.

Signed-off-by Michael Straube <[email protected]>

---
 drivers/staging/r8188eu/core/rtw_pwrctrl.c    | 7 +++++--
 drivers/staging/r8188eu/include/rtw_pwrctrl.h | 5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

drivers/staging/r8188eu/core/rtw_pwrctrl.c +5 -2

index 08e8a5efba5e..ee324c18a1b9 100644
@@ -349,16 +349,19 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 /*
 * rtw_pwr_wakeup - Wake the NIC up from: 1)IPS. 2)USB autosuspend
 * @adapter: pointer to struct adapter structure
-* @ips_deffer_ms: the ms wiil prevent from falling into IPS after wakeup
 * Return _SUCCESS or _FAIL
 */
 
-int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms)
+int _rtw_pwr_wakeup(struct adapter *padapter)
 {
 	struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 	int ret = _SUCCESS;
 	u32 start = jiffies;
+	u32 ips_deffer_ms;
+
+	/* the ms will prevent from falling into IPS after wakeup */
+	ips_deffer_ms = RTW_PWR_STATE_CHK_INTERVAL;
 
 	if (pwrpriv->ips_deny_time < jiffies + rtw_ms_to_systime(ips_deffer_ms))
 		pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);

drivers/staging/r8188eu/include/rtw_pwrctrl.h +2 -3

index 0a0f7a4c4052..fd301a9f117a 100644
@@ -121,9 +121,8 @@ s32 LPS_RF_ON_check(struct adapter *adapter, u32 delay_ms);
 void LPS_Enter(struct adapter *adapter);
 void LPS_Leave(struct adapter *adapter);
 
-int _rtw_pwr_wakeup(struct adapter *adapter, u32 ips_defer_ms);
-#define rtw_pwr_wakeup(adapter)						\
-	 _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL)
+int _rtw_pwr_wakeup(struct adapter *adapter);
+#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter)
 int rtw_pm_set_ips(struct adapter *adapter, u8 mode);
 int rtw_pm_set_lps(struct adapter *adapter, u8 mode);

Signature · 1 line

2.35.1

Michael Straube

author

2022-04-03 10:37 UTC #3 lore raw

PATCH 3/4 staging: r8188eu: remove macro rtw_pwr_wakeup()

In reply to Michael Straube

After previous cleanups the rtw_pwr_wakeup() macro is just an alias for _rtw_pwr_wakeup(). Remove the macro and rename _rtw_pwr_wakeup() to rtw_pwr_wakeup().

Signed-off-by Michael Straube <[email protected]>

---
 drivers/staging/r8188eu/core/rtw_pwrctrl.c    | 2 +-
 drivers/staging/r8188eu/include/rtw_pwrctrl.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

drivers/staging/r8188eu/core/rtw_pwrctrl.c +1 -1

index ee324c18a1b9..6f97c7a879a5 100644
@@ -352,7 +352,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 * Return _SUCCESS or _FAIL
 */
 
-int _rtw_pwr_wakeup(struct adapter *padapter)
+int rtw_pwr_wakeup(struct adapter *padapter)
 {
 	struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

drivers/staging/r8188eu/include/rtw_pwrctrl.h +1 -2

index fd301a9f117a..4cc365aa3fa7 100644
@@ -121,8 +121,7 @@ s32 LPS_RF_ON_check(struct adapter *adapter, u32 delay_ms);
 void LPS_Enter(struct adapter *adapter);
 void LPS_Leave(struct adapter *adapter);
 
-int _rtw_pwr_wakeup(struct adapter *adapter);
-#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter)
+int rtw_pwr_wakeup(struct adapter *adapter);
 int rtw_pm_set_ips(struct adapter *adapter, u8 mode);
 int rtw_pm_set_lps(struct adapter *adapter, u8 mode);

Signature · 1 line

2.35.1

Michael Straube

author

2022-04-03 10:37 UTC #4 lore raw

PATCH 4/4 staging: r8188eu: clean up comment for rtw_pwr_wakeup()

In reply to Michael Straube

Clean up the comment for rtw_pwr_wakeup() by removing obvious information.

Signed-off-by Michael Straube <[email protected]>

---
 drivers/staging/r8188eu/core/rtw_pwrctrl.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

drivers/staging/r8188eu/core/rtw_pwrctrl.c +1 -6

index 6f97c7a879a5..ac54cfb63fa3 100644
@@ -346,12 +346,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 	timer_setup(&pwrctrlpriv->pwr_state_check_timer, pwr_state_check_handler, 0);
 }
 
-/*
-* rtw_pwr_wakeup - Wake the NIC up from: 1)IPS. 2)USB autosuspend
-* @adapter: pointer to struct adapter structure
-* Return _SUCCESS or _FAIL
-*/
-
+/* Wake the NIC up from: 1)IPS 2)USB autosuspend */
 int rtw_pwr_wakeup(struct adapter *padapter)
 {
 	struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;

Signature · 1 line

2.35.1