staging: rtl8723bs: cleanup osdep_service.h
cover staging: rtl8723bs: cleanup osdep_service.h
This series cleans up the include/osdep_service.h file from unused code and macros.
Nikolay Kulikov (6):
staging: rtl8723bs: remove unnecessary rtw_bug_check() function
staging: rtl8723bs: remove unused _rtw_init_queue() function header
staging: rtl8723bs: remove the header of non-existent _kfree()
function
staging: rtl8723bs: remove unused rtw_sprintf() macro
staging: rtl8723bs: remove the rtw_warn_on() macro
staging: rtl8723bs: remove unused BIT33..BIT36 macros
drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 12 +--------- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_recv.c | 3 --- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 1 - .../staging/rtl8723bs/core/rtw_wlan_util.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 6 +---- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- .../staging/rtl8723bs/include/osdep_service.h | 23 ------------------- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 +++---- 10 files changed, 12 insertions(+), 53 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/6 staging: rtl8723bs: remove unnecessary rtw_bug_check() function
Remove the rtw_bug_check() function as it does nothing and always returns 'true', making any checks on its result meaningless.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 ---------- drivers/staging/rtl8723bs/include/osdep_service.h | 9 --------- 2 files changed, 19 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -10
@@ -351,9 +351,6 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feau16 s_cap, d_cap;__le16 tmps, tmpd; -if (rtw_bug_check (dst, src, &s_cap, &d_cap) == false) -return false; -memcpy ((u8 *)&tmps,rtw_get_capability_from_ie (src->ies),2 );memcpy ((u8 *)&tmpd,rtw_get_capability_from_ie (dst->ies),2 );
@@ -457,11 +454,6 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex {struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -rtw_bug_check (&pmlmepriv->cur_network.network, - &pmlmepriv->cur_network.network, - &pmlmepriv->cur_network.network, - &pmlmepriv->cur_network.network); -if (check_fwstate (pmlmepriv, _FW_LINKED) && (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) {update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true); rtw_update_protection(adapter, (pmlmepriv->cur_network.network.ies) + sizeof(struct ndis_802_11_fix_ie),
@@ -486,8 +478,6 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *tlist_for_each (plist, phead) { pnetwork = list_entry(plist, struct wlan_network, list); -rtw_bug_check (pnetwork, pnetwork, pnetwork, pnetwork); -if (is_same_network (&pnetwork->network, target, feature)) { target_find =1 ;break ;
drivers/staging/rtl8723bs/include/osdep_service.h +0 -9
@@ -69,15 +69,6 @@ static inline void flush_signals_thread(void) }#define rtw_warn_on (condition) WARN_ON(condition) - -static inline int rtw_bug_check (void *parg1,void *parg2,void *parg3,void *parg4) -{ -int ret = true; - -return ret; - -} -#define _RND (sz, r) ((((sz)+((r)-1))/(r))*(r))extern void rtw_free_netdev (struct net_device *netdev);
Signature · 1 line
2.53.0
PATCH 2/6 staging: rtl8723bs: remove unused _rtw_init_queue() function header
In reply to Nikolay KulikovThe _rtw_init_queue() function header is declared in osdep_service.h, but it is not defined anywhere and all the code using it is commented out, so we can remove the header and the commented out code.
--- drivers/staging/rtl8723bs/core/rtw_recv.c | 3 --- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 1 - drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 ---- drivers/staging/rtl8723bs/include/osdep_service.h | 2 -- 4 files changed, 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -3
@@ -21,9 +21,6 @@ void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)spin_lock_init (&psta_recvpriv->lock); -/* for (i = 0; i<MAX_RX_NUMBLKS; i++) */ -/* _rtw_init_queue(&psta_recvpriv->blk_strms[i]); */ -INIT_LIST_HEAD (&psta_recvpriv->defrag_q.queue);spin_lock_init (&psta_recvpriv->defrag_q.lock); }
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +0 -1
@@ -67,7 +67,6 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)spin_lock_init (&pstapriv->sta_hash_lock); -/* _rtw_init_queue(&pstapriv->asoc_q); */ pstapriv->asoc_sta_count =0 ;INIT_LIST_HEAD (&pstapriv->sleep_q.queue);spin_lock_init (&pstapriv->sleep_q.lock);
drivers/staging/rtl8723bs/core/rtw_xmit.c +0 -4
@@ -45,10 +45,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)init_completion (&pxmitpriv->xmit_comp);init_completion (&pxmitpriv->terminate_xmitthread_comp); -/* -* Please insert all the queue initialization using _rtw_init_queue below -*/ - pxmitpriv->adapter = padapter;INIT_LIST_HEAD (&pxmitpriv->be_pending.queue);
drivers/staging/rtl8723bs/include/osdep_service.h +0 -2
@@ -60,8 +60,6 @@ int _rtw_netif_rx(struct net_device *ndev, struct sk_buff *skb);#define rtw_netif_rx (ndev, skb) _rtw_netif_rx(ndev, skb) -extern void _rtw_init_queue (struct __queue *pqueue); -static inline void flush_signals_thread (void ) {if (signal_pending (current))
Signature · 1 line
2.53.0
PATCH 3/6 staging: rtl8723bs: remove the header of non-existent _kfree() function
In reply to Nikolay KulikovRemove the _kfree() function header, as it is not defined anywhere and is not called anywhere.
--- drivers/staging/rtl8723bs/include/osdep_service.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8723bs/include/osdep_service.h +0 -2
@@ -54,8 +54,6 @@extern int RTW_STATUS_CODE (int error_code); -void _kfree (u8 *pbuf,u32 sz); -int _rtw_netif_rx (struct net_device *ndev,struct sk_buff *skb);#define rtw_netif_rx (ndev, skb) _rtw_netif_rx(ndev, skb)
Signature · 1 line
2.53.0
PATCH 4/6 staging: rtl8723bs: remove unused rtw_sprintf() macro
In reply to Nikolay KulikovRemove the unused rtw_sprintf() macro, which is a wrapper around the standard Kernel function snprintf().
--- drivers/staging/rtl8723bs/include/osdep_service.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/rtl8723bs/include/osdep_service.h +0 -5
@@ -87,10 +87,5 @@ bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf);void *rtw_cbuf_pop (struct rtw_cbuf *cbuf);struct rtw_cbuf *rtw_cbuf_alloc (u32 size); -/* String handler */ -/* -* Write formatted output to sized buffer -*/ -#define rtw_sprintf(buf, size, format, arg...) snprintf(buf, size, format, ##arg)#endif
Signature · 1 line
2.53.0
PATCH 5/6 staging: rtl8723bs: remove the rtw_warn_on() macro
In reply to Nikolay KulikovRemove the rtw_warn_on() macro, which simply calls WARN_ON(), and replace all its uses with the standard WARN_ON().
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/osdep_service.h | 1 - drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++++---- 8 files changed, 12 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -1603,7 +1603,7 @@ static void rtw_btinfo_hdl(struct adapter *adapter, u8 *buf, u16 buf_len) cmd_idx = info->cid;if (info->len > buf_len -2 ) { -rtw_warn_on (1 ); +WARN_ON (1 ); len = buf_len -2 ; }else { len = info->len;
drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1
@@ -1697,7 +1697,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme)struct wlan_network *candidate =NULL ;if (!mlme->cur_network_scanned) { -rtw_warn_on (1 ); +WARN_ON (1 );return ret; }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -3082,7 +3082,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int powelse rtw_hal_macid_wakeup (padapter, psta->mac_id); }else { -rtw_warn_on (1 ); +WARN_ON (1 ); } do {
@@ -5890,7 +5890,7 @@ int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offsetbool connect_allow = true;if (!ch || !bw || !offset) { -rtw_warn_on (1 ); +WARN_ON (1 ); connect_allow = false; }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +2 -2
@@ -577,7 +577,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid)netdev_dbg (adapter->pnetdev,FUNC_ADPT_FMT " group key with invalid key id:%u\n" ,FUNC_ADPT_ARG (adapter), kid); -rtw_warn_on (1 ); +WARN_ON (1 ); goto bitmap_handle; }
@@ -623,7 +623,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid)netdev_dbg (adapter->pnetdev,FUNC_ADPT_FMT " group key id:%u no room\n" ,FUNC_ADPT_ARG (adapter), kid); -rtw_warn_on (1 ); +WARN_ON (1 ); goto bitmap_handle; }
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -2035,7 +2035,7 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe) allow = true; else if (registry->hiq_filter == RTW_HIQ_FILTER_DENY_ALL) { } else - rtw_warn_on(1); + WARN_ON(1);return allow; }
drivers/staging/rtl8723bs/hal/hal_com.c +1 -1
@@ -576,7 +576,7 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)switch (variable) {case HW_VAR_INIT_RTS_RATE : -rtw_warn_on (1 ); +WARN_ON (1 );break ;case HW_VAR_SEC_CFG : {
drivers/staging/rtl8723bs/include/osdep_service.h +0 -1
@@ -64,7 +64,6 @@ static inline void flush_signals_thread(void)flush_signals (current); } -#define rtw_warn_on (condition) WARN_ON(condition)#define _RND (sz, r) ((((sz)+((r)-1))/(r))*(r))extern void rtw_free_netdev (struct net_device *netdev);
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -4
@@ -377,7 +377,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)rtw_cfg80211_inform_bss (padapter, cur_network); } else { if (!scanned) { - rtw_warn_on(1); + WARN_ON(1); return; } if (!memcmp(&scanned->network.ssid, &pnetwork->ssid,
@@ -385,7 +385,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) !memcmp(scanned->network.mac_address, pnetwork->mac_address, ETH_ALEN))rtw_cfg80211_inform_bss (padapter, scanned); else - rtw_warn_on(1); + WARN_ON(1); }if (!rtw_cfg80211_check_bss (padapter))
@@ -418,7 +418,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)struct wlan_network *scanned = pmlmepriv->cur_network_scanned;if (!scanned) { -rtw_warn_on (1 ); +WARN_ON (1 ); goto check_bss; }
@@ -427,7 +427,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter) sizeof(struct ndis_802_11_ssid)))rtw_cfg80211_inform_bss (padapter, scanned); else - rtw_warn_on(1); + WARN_ON(1); } check_bss:
Signature · 1 line
2.53.0
PATCH 6/6 staging: rtl8723bs: remove unused BIT33..BIT36 macros
In reply to Nikolay KulikovThese bit definitions are not used anywhere in the driver. Removing them clears the header and eliminates dead code.
---
I didn't touch the BIT0..BIT32 macros because they are used somewhere, and a separate series is needed to replace them.
drivers/staging/rtl8723bs/include/osdep_service.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/rtl8723bs/include/osdep_service.h +0 -4
@@ -47,10 +47,6 @@#define BIT30 0x40000000#define BIT31 0x80000000#define BIT32 0x0100000000 -#define BIT33 0x0200000000 -#define BIT34 0x0400000000 -#define BIT35 0x0800000000 -#define BIT36 0x1000000000extern int RTW_STATUS_CODE (int error_code);
Signature · 1 line
2.53.0