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

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

[Martin Kaiser]

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

[PATCH 1/4] staging: r8188eu: remove empty rtw_set_scan_deny macro

[Martin Kaiser]

The rtw_set_scan_deny macro does nothing. Remove it.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/core/rtw_mlme.c    | 2 --
 drivers/staging/r8188eu/core/rtw_xmit.c    | 3 ---
 drivers/staging/r8188eu/include/rtw_mlme.h | 1 -
 3 files changed, 6 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 2c80635b6478..596bb03b6ee3 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -904,8 +904,6 @@ void rtw_indicate_connect(struct adapter *padapter)
 	}
 
 	pmlmepriv->to_roaming = 0;
-
-	rtw_set_scan_deny(padapter, 3000);
 }
 
 /*
diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index d41d1d09d8ae..98864fc55b25 100644
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -550,9 +550,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
 		}
 	}
 
-	if ((pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1))
-		rtw_set_scan_deny(padapter, 3000);
-
 	/*  If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */
 	if ((pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1))
 		rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1);
diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index a959e2100c3f..30fb9b7d7ad2 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -540,7 +540,6 @@ void rtw_scan_timeout_handler(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)
-#define rtw_set_scan_deny(adapter, ms) do {} while (0)
 
 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
 
-- 
2.30.2

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

[Martin Kaiser]

Remove the rtw_set_scan_deny_timer_hdl macro, it's not used.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 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

[PATCH 3/4] staging: r8188eu: remove rtw_clear_scan_deny

[Martin Kaiser]

The rtw_clear_scan_deny macro is empty. Remove it.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/core/rtw_mlme.c    | 3 ---
 drivers/staging/r8188eu/include/rtw_mlme.h | 1 -
 2 files changed, 4 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 596bb03b6ee3..de722c199cce 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -264,8 +264,6 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* struct	mlme_priv *pmlmepriv)
 
 	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
 
-	rtw_clear_scan_deny(padapter);
-
 	rtw_init_mlme_timer(padapter);
 
 exit:
@@ -928,7 +926,6 @@ void rtw_indicate_disconnect(struct adapter *padapter)
 
 		_clr_fwstate_(pmlmepriv, _FW_LINKED);
 		rtw_led_control(padapter, LED_CTL_NO_LINK);
-		rtw_clear_scan_deny(padapter);
 	}
 	p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
 
diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index e000f0565458..47bf7ce228aa 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -538,7 +538,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)
 
 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
 
-- 
2.30.2

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

[Martin Kaiser]

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

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 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

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

[Pavel Skripkin]

Hi Martin,

Martin Kaiser <martin@kaiser.cx> 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 <paskripkin@gmail.com>


With regards,
Pavel Skripkin

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

[Philipp Hortmann]

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 <philipp.g.hortmann@gmail.com> # Edimax N150