Skip to contentSkip to conversation

staging: rtl8723bs: os_dep: Remove conditions with no effects

PATCH Superseded Fabio M. De Francesco 2 participants 3 messages Jun 6, 2021 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: os_dep: Remove conditions with no effects

Removed conditions with no effects. Detected by Coccinelle.

---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/os_dep/os_intfs.c +2 -9
index 213ec5b4ce98..2035573ee5a0 100644
@@ -1187,10 +1187,7 @@ void rtw_suspend_common(struct adapter *padapter)
 
 	rtw_ps_deny_cancel(padapter, PS_DENY_SUSPEND);
 
-	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
-		rtw_suspend_normal(padapter);
-	else
-		rtw_suspend_normal(padapter);
+	rtw_suspend_normal(padapter);
 
 	netdev_dbg(padapter->pnetdev, "rtw suspend success in %d ms\n",
 		   jiffies_to_msecs(jiffies - start_time));
@@ -1268,11 +1265,7 @@ int rtw_resume_common(struct adapter *padapter)
 
 	netdev_dbg(padapter->pnetdev, "resume start\n");
 
-	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
-		rtw_resume_process_normal(padapter);
-	} else {
-		rtw_resume_process_normal(padapter);
-	}
+	rtw_resume_process_normal(padapter);
 
 	hal_btcoex_SuspendNotify(padapter, 0);
 
Signature · 1 line
2.31.1
#1 lore raw
Quoted 1 line · Fabio M. De Francesco

Removed conditions with no effects. Detected by Coccinelle.

It's be good if you researched how this came to be and noted it in the changelog.

try:

commit dc365d2cc579200bc3752ddb941e046e3a16962c

Author: Fabio Aiuto <[email protected]>
Date:   Tue Mar 16 15:04:11 2021 +0100

staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_AP_WOWLAN

#2 lore raw
Quoted 6 lines · CEST Joe Perches
Quoted 1 line · Fabio M. De Francesco

Removed conditions with no effects. Detected by Coccinelle.

It's be good if you researched how this came to be and noted it in the changelog.

Quoted 9 lines

try:

commit dc365d2cc579200bc3752ddb941e046e3a16962c

Author: Fabio Aiuto <[email protected]>
Date:   Tue Mar 16 15:04:11 2021 +0100

staging: rtl8723bs: remove unused code blocks conditioned by never set
CONFIG_AP_WOWLAN

I've just read the commit you pointed out. It seems that the conditions with no effects came out while removing code that was conditionally compiled by the unused definition CONFIG_AP_WOWLAN.

However, I don't understand why those "conditions with no effects" have been left there.

Now I'm not sure of what you asked me to do: should I leave them there as they are (perhaps because I missed something) or should I explain in my patch that they were overlooked by commit dc365d2cc579?

Thanks in advance,

Fabio