2022-09-10 18:29:26

by Martin Kaiser

Subject: [PATCH 0/4] staging: r8188eu: remove empty rtw_*scan* macros

Remove four rtw_*scan* macros which are empty or constant.

Martin Kaiser (4):
staging: r8188eu: remove empty rtw_set_scan_deny macro
staging: r8188eu: remove rtw_set_scan_deny_timer_hdl
staging: r8188eu: remove rtw_clear_scan_deny
staging: r8188eu: rtw_is_scan_deny is always false

drivers/staging/r8188eu/core/rtw_ioctl_set.c | 5 -----
drivers/staging/r8188eu/core/rtw_mlme.c | 5 -----
drivers/staging/r8188eu/core/rtw_xmit.c | 3 ---
drivers/staging/r8188eu/include/rtw_mlme.h | 4 ----
4 files changed, 17 deletions(-)

--
2.30.2

2022-09-10 18:38:22

by Martin Kaiser

Subject: [PATCH 2/4] staging: r8188eu: remove rtw_set_scan_deny_timer_hdl

Remove the rtw_set_scan_deny_timer_hdl macro, it's not used.

Signed-off-by: Martin Kaiser <[email protected]>
---
drivers/staging/r8188eu/include/rtw_mlme.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index 30fb9b7d7ad2..e000f0565458 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -539,7 +539,6 @@ void rtw_scan_timeout_handler(struct adapter *adapter);
void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
#define rtw_is_scan_deny(adapter) false
#define rtw_clear_scan_deny(adapter) do {} while (0)
-#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0)

void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);

--
2.30.2

2022-09-10 18:38:58

by Martin Kaiser

Subject: [PATCH 4/4] staging: r8188eu: rtw_is_scan_deny is always false

The rtw_is_scan_deny macro returns false. Remove the macro and resulting
dead code.

Signed-off-by: Martin Kaiser <[email protected]>
---
drivers/staging/r8188eu/core/rtw_ioctl_set.c | 5 -----
drivers/staging/r8188eu/include/rtw_mlme.h | 1 -
2 files changed, 6 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_ioctl_set.c b/drivers/staging/r8188eu/core/rtw_ioctl_set.c
index d163a1a256ed..55e6b0f41dc3 100644
--- a/drivers/staging/r8188eu/core/rtw_ioctl_set.c
+++ b/drivers/staging/r8188eu/core/rtw_ioctl_set.c
@@ -351,11 +351,6 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
/* Scan or linking is in progress, do nothing. */
res = true;
} else {
- if (rtw_is_scan_deny(padapter)) {
- indicate_wx_scan_complete_event(padapter);
- return _SUCCESS;
- }
-
spin_lock_bh(&pmlmepriv->lock);

res = rtw_sitesurvey_cmd(padapter, pssid, ssid_max_num);
diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index 47bf7ce228aa..b69989cbab21 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -537,7 +537,6 @@ void _rtw_join_timeout_handler(struct adapter *adapter);
void rtw_scan_timeout_handler(struct adapter *adapter);

void rtw_dynamic_check_timer_handlder(struct adapter *adapter);
-#define rtw_is_scan_deny(adapter) false

void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);

--
2.30.2

2022-09-10 19:41:36

by Pavel Skripkin

Subject: Re: [PATCH 0/4] staging: r8188eu: remove empty rtw_*scan* macros

Hi Martin,

Martin Kaiser <[email protected]> says:
> Remove four rtw_*scan* macros which are empty or constant.
>
> Martin Kaiser (4):
> staging: r8188eu: remove empty rtw_set_scan_deny macro
> staging: r8188eu: remove rtw_set_scan_deny_timer_hdl
> staging: r8188eu: remove rtw_clear_scan_deny
> staging: r8188eu: rtw_is_scan_deny is always false
>
> drivers/staging/r8188eu/core/rtw_ioctl_set.c | 5 -----
> drivers/staging/r8188eu/core/rtw_mlme.c | 5 -----
> drivers/staging/r8188eu/core/rtw_xmit.c | 3 ---
> drivers/staging/r8188eu/include/rtw_mlme.h | 4 ----
> 4 files changed, 17 deletions(-)
>

Acked-by: Pavel Skripkin <[email protected]>


With regards,
Pavel Skripkin

2022-09-11 02:14:54

by Philipp Hortmann

Subject: Re: [PATCH 0/4] staging: r8188eu: remove empty rtw_*scan* macros

On 9/10/22 20:02, Martin Kaiser wrote:
> Remove four rtw_*scan* macros which are empty or constant.
>
> Martin Kaiser (4):
> staging: r8188eu: remove empty rtw_set_scan_deny macro
> staging: r8188eu: remove rtw_set_scan_deny_timer_hdl
> staging: r8188eu: remove rtw_clear_scan_deny
> staging: r8188eu: rtw_is_scan_deny is always false
>
> drivers/staging/r8188eu/core/rtw_ioctl_set.c | 5 -----
> drivers/staging/r8188eu/core/rtw_mlme.c | 5 -----
> drivers/staging/r8188eu/core/rtw_xmit.c | 3 ---
> drivers/staging/r8188eu/include/rtw_mlme.h | 4 ----
> 4 files changed, 17 deletions(-)
>


Tested-by: Philipp Hortmann <[email protected]> # Edimax N150