2021-06-06 07:44:34

by Fabio M. De Francesco

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

Removed conditions with no effects. Detected by Coccinelle.
It seems that these conditions with no effects had been inadvertently
left while deleting code that had to be conditionally compiled by
unused definition CONFIG_AP_WOWLAN (see commit dc365d2cc579).

Signed-off-by: Fabio M. De Francesco <[email protected]>
---

v1 -> v2: Rewrote the changelog according to suggestion by
Joe Perches <[email protected]>

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

2021-06-07 14:52:16

by Fabio Aiuto

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

On Sun, Jun 06, 2021 at 09:42:16AM +0200, Fabio M. De Francesco wrote:
> Removed conditions with no effects. Detected by Coccinelle.
> It seems that these conditions with no effects had been inadvertently
> left while deleting code that had to be conditionally compiled by
> unused definition CONFIG_AP_WOWLAN (see commit dc365d2cc579).
>
> Signed-off-by: Fabio M. De Francesco <[email protected]>
> ---
>
> v1 -> v2: Rewrote the changelog according to suggestion by
> Joe Perches <[email protected]>
>
> 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
>
>

Thank you Fabio :)

Reviewed-by: Fabio Aiuto <[email protected]>

2021-06-09 18:45:14

by Greg Kroah-Hartman

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

On Sun, Jun 06, 2021 at 09:42:16AM +0200, Fabio M. De Francesco wrote:
> Removed conditions with no effects. Detected by Coccinelle.
> It seems that these conditions with no effects had been inadvertently
> left while deleting code that had to be conditionally compiled by
> unused definition CONFIG_AP_WOWLAN (see commit dc365d2cc579).
>
> Signed-off-by: Fabio M. De Francesco <[email protected]>
> ---
>
> v1 -> v2: Rewrote the changelog according to suggestion by
> Joe Perches <[email protected]>
>
> 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

This patch adds a build warning:

drivers/staging/rtl8723bs/os_dep/os_intfs.c: In function ‘rtw_resume_common’:
drivers/staging/rtl8723bs/os_dep/os_intfs.c:1264:27: warning: unused variable ‘pmlmepriv’ [-Wunused-variable]
1264 | struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
| ^~~~~~~~~
LD [M] drivers/staging/rtl8723bs/r8723bs.o


So I can not take it, please fix up and resend.

thanks,

greg k-h