[PATCH] staging: rtl8723bs: os_dep: Remove conditions with no effects

[PATCH] staging: rtl8723bs: os_dep: Remove conditions with no effects

[Fabio M. De Francesco]

Removed conditions with no effects. Detected by Coccinelle.

Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 213ec5b4ce98..2035573ee5a0 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -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);
 
-- 
2.31.1

Re: [PATCH] staging: rtl8723bs: os_dep: Remove conditions with no effects

[Joe Perches]

On Sun, 2021-06-06 at 06:35 +0200, Fabio M. De Francesco wrote:
> 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 <fabioaiuto83@gmail.com>
Date:   Tue Mar 16 15:04:11 2021 +0100

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

Re: [PATCH] staging: rtl8723bs: os_dep: Remove conditions with no effects

[Fabio M. De Francesco]

On Sunday, June 6, 2021 7:56:32 AM CEST Joe Perches wrote:
> On Sun, 2021-06-06 at 06:35 +0200, Fabio M. De Francesco wrote:
> > 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 <fabioaiuto83@gmail.com>
> 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