staging: r8188eu: set of simple cleanups
cover staging: r8188eu: set of simple cleanups
This series removes unused struct, function arguments, macros and empty functions.
Abdun Nihaal (9):
staging: r8188eu: remove unused struct zero_bulkout_context
staging: r8188eu: remove empty function
rtw_get_encrypt_decrypt_from_registrypriv
staging: r8188eu: remove empty function rtw_mfree_mlme_priv_lock
staging: r8188eu: remove empty function _InitOperationMode
staging: r8188eu: remove empty function __nat25_db_print
staging: r8188eu: remove unused argument in __nat25_has_expired
staging: r8188eu: remove unused argument in on_action_public_default
staging: r8188eu: remove unused argument in chk_ap_is_alive
staging: r8188eu: remove unused macros in sta_info.h
drivers/staging/r8188eu/core/rtw_br_ext.c | 15 +----- drivers/staging/r8188eu/core/rtw_mlme.c | 13 ------ drivers/staging/r8188eu/core/rtw_mlme_ext.c | 8 ++-- drivers/staging/r8188eu/hal/usb_halinit.c | 5 -- drivers/staging/r8188eu/include/rtw_mlme.h | 2 - drivers/staging/r8188eu/include/sta_info.h | 46 ------------------- .../staging/r8188eu/os_dep/usb_ops_linux.c | 7 --- 7 files changed, 6 insertions(+), 90 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/9 staging: r8188eu: remove unused struct zero_bulkout_context
struct zero_bulkout_context is not used. Remove it.
--- drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/r8188eu/os_dep/usb_ops_linux.c +0 -7
@@ -20,13 +20,6 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr)return pipe; } -struct zero_bulkout_context { -void *pbuf; -void *purb; -void *pirp; -void *padapter; -}; -void rtw_read_port_cancel (struct adapter *padapter) {int i;
Signature · 1 line
2.34.1
PATCH 2/9 staging: r8188eu: remove empty function rtw_get_encrypt_decrypt_from_registrypriv
In reply to Abdun NihaalThe definition of function rtw_get_encrypt_decrypt_from_registrypriv is empty. Remove it.
--- drivers/staging/r8188eu/core/rtw_mlme.c | 7 ------- drivers/staging/r8188eu/include/rtw_mlme.h | 2 -- 2 files changed, 9 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +0 -7
@@ -1020,8 +1020,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ;unsigned int the_same_macaddr = false; -rtw_get_encrypt_decrypt_from_registrypriv (adapter); - the_same_macaddr = !memcmp (pnetwork->network.MacAddress, cur_network->network.MacAddress,ETH_ALEN ); pnetwork->network.Length =get_wlan_bssid_ex_sz (&pnetwork->network);
@@ -1857,11 +1855,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) } -void rtw_get_encrypt_decrypt_from_registrypriv (struct adapter *adapter) -{ - -} -/* the function is at passive_level */ void rtw_joinbss_reset (struct adapter *padapter) {
drivers/staging/r8188eu/include/rtw_mlme.h +0 -2
@@ -549,8 +549,6 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter);void rtw_update_registrypriv_dev_network (struct adapter *adapter); -void rtw_get_encrypt_decrypt_from_registrypriv (struct adapter *adapter); -void _rtw_join_timeout_handler (struct adapter *adapter);void rtw_scan_timeout_handler (struct adapter *adapter);
Signature · 1 line
2.34.1
PATCH 3/9 staging: r8188eu: remove empty function rtw_mfree_mlme_priv_lock
In reply to Abdun NihaalThe definition of function rtw_mfree_mlme_priv_lock is empty. Remove it.
--- drivers/staging/r8188eu/core/rtw_mlme.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +0 -6
@@ -85,10 +85,6 @@ int _rtw_init_mlme_priv(struct adapter *padapter)return res; } -static void rtw_mfree_mlme_priv_lock (struct mlme_priv *pmlmepriv) -{ -} -static void rtw_free_mlme_ie_data (u8 **ppie,u32 *plen) {kfree (*ppie);
@@ -118,8 +114,6 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)rtw_free_mlme_priv_ie_data (pmlmepriv);if (pmlmepriv) { -rtw_mfree_mlme_priv_lock (pmlmepriv); -vfree (pmlmepriv->free_bss_buf); }
Signature · 1 line
2.34.1
PATCH 4/9 staging: r8188eu: remove empty function _InitOperationMode
In reply to Abdun NihaalThe definition of function _InitOperationMode is empty. Remove it.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -5
@@ -449,10 +449,6 @@ static void InitUsbAggregationSetting(struct adapter *Adapter)usb_AggSettingRxUpdate (Adapter); } -static void _InitOperationMode (struct adapter *Adapter) -{ -} -static void _InitBeaconParameters (struct adapter *Adapter) {struct hal_data_8188e *haldata = &Adapter->haldata;
@@ -635,7 +631,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)_InitEDCA (Adapter);_InitRetryFunction (Adapter);InitUsbAggregationSetting (Adapter); -_InitOperationMode (Adapter);/* todo */ _InitBeaconParameters (Adapter);/* */
Signature · 1 line
2.34.1
PATCH 5/9 staging: r8188eu: remove empty function __nat25_db_print
In reply to Abdun NihaalThe definition of function __nat25_db_print is empty. Remove it.
--- drivers/staging/r8188eu/core/rtw_br_ext.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/staging/r8188eu/core/rtw_br_ext.c +0 -10
@@ -319,10 +319,6 @@ static void __nat25_db_network_insert(struct adapter *priv,spin_unlock_bh (&priv->br_ext_lock); } -static void __nat25_db_print (struct adapter *priv) -{ -} -/* * NAT2.5 interface */
@@ -422,8 +418,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)__nat25_generate_ipv4_network_addr (networkAddr, &tmp);/* record source IP address and , source mac address into db */ __nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); - -__nat25_db_print (priv);return 0 ;default :return -1 ;
@@ -454,7 +448,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) sender = (unsigned int *)arp_ptr;__nat25_generate_ipv4_network_addr (networkAddr, sender);__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv);return 0 ;default :return -1 ;
@@ -535,8 +528,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv); -if (!priv->ethBrExtInfo.addPPPoETag && priv->pppoe_connection_in_progress && !memcmp (skb->data+ETH_ALEN , priv->pppoe_addr,ETH_ALEN ))
@@ -597,7 +588,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)if (memcmp (&iph->saddr,"\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0" ,16 )) {__nat25_generate_ipv6_network_addr (networkAddr, (unsigned int *)&iph->saddr);__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv);if (iph->nexthdr ==IPPROTO_ICMPV6 && skb->len > (ETH_HLEN +sizeof (*iph) +4 )) {
Signature · 1 line
2.34.1
PATCH 6/9 staging: r8188eu: remove unused argument in __nat25_has_expired
In reply to Abdun NihaalThe argument priv is not used in function __nat25_has_expired. Remove it.
--- drivers/staging/r8188eu/core/rtw_br_ext.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/r8188eu/core/rtw_br_ext.c +2 -3
@@ -105,8 +105,7 @@ static int skb_pull_and_merge(struct sk_buff *skb, unsigned char *src, int len)return 0 ; } -static int __nat25_has_expired (struct adapter *priv, -struct nat25_network_db_entry *fdb) +static int __nat25_has_expired (struct nat25_network_db_entry *fdb) {if (time_before_eq (fdb->ageing_timer, jiffies -NAT25_AGEING_TIME *HZ ))return 1 ;
@@ -363,7 +362,7 @@ void nat25_db_expire(struct adapter *priv)struct nat25_network_db_entry *g; g = f->next_hash; -if (__nat25_has_expired (priv, f)) { +if (__nat25_has_expired (f)) {if (atomic_dec_and_test (&f->use_count)) {if (priv->scdb_entry == f) {memset (priv->scdb_mac,0 ,ETH_ALEN );
Signature · 1 line
2.34.1
PATCH 7/9 staging: r8188eu: remove unused argument in on_action_public_default
In reply to Abdun NihaalThe function argument action is not used in on_action_public_default. Remove it.
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +2 -2
@@ -4044,7 +4044,7 @@ static unsigned int on_action_public_vendor(struct recv_frame *precv_frame)return ret; } -static unsigned int on_action_public_default (struct recv_frame *precv_frame,u8 action) +static unsigned int on_action_public_default (struct recv_frame *precv_frame) {unsigned int ret = _FAIL;u8 *pframe = precv_frame->rx_data;
@@ -4083,7 +4083,7 @@ unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv ret =on_action_public_vendor (precv_frame);break ;default : - ret =on_action_public_default (precv_frame, action); + ret =on_action_public_default (precv_frame);break ; }
Signature · 1 line
2.34.1
PATCH 8/9 staging: r8188eu: remove unused argument in chk_ap_is_alive
In reply to Abdun NihaalThe function argument padapter is not used in chk_ap_is_alive. Remove it.
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +2 -2
@@ -7157,7 +7157,7 @@ static void _linked_rx_signal_strength_display(struct adapter *padapter) "UndecoratedSmoothedPWDB:%d\n", UndecoratedSmoothedPWDB); } -static u8 chk_ap_is_alive (struct adapter *padapter,struct sta_info *psta) +static u8 chk_ap_is_alive (struct sta_info *psta) {u8 ret = false;
@@ -7221,7 +7221,7 @@ void linked_status_chk(struct adapter *padapter)bool is_p2p_enable = false; is_p2p_enable = !rtw_p2p_chk_state (&padapter->wdinfo,P2P_STATE_NONE ); -if (!chk_ap_is_alive (padapter, psta)) +if (!chk_ap_is_alive (psta)) rx_chk = _FAIL;if (pxmitpriv->last_tx_pkts == pxmitpriv->tx_pkts)
Signature · 1 line
2.34.1
PATCH 9/9 staging: r8188eu: remove unused macros in sta_info.h
In reply to Abdun NihaalSome of the sta_* and STA_* macros are not used.
Remove those unused macros.
--- drivers/staging/r8188eu/include/sta_info.h | 46 ---------------------- 1 file changed, 46 deletions(-)
drivers/staging/r8188eu/include/sta_info.h +0 -46
@@ -210,53 +210,24 @@ struct sta_info { + sta->sta_stats.rx_ctrl_pkts \ + sta->sta_stats.rx_data_pkts) -#define sta_last_rx_pkts (sta) \ - (sta->sta_stats.last_rx_mgnt_pkts \ - + sta->sta_stats.last_rx_ctrl_pkts \ - + sta->sta_stats.last_rx_data_pkts) -#define sta_rx_data_pkts (sta) \ (sta->sta_stats.rx_data_pkts)#define sta_last_rx_data_pkts (sta) \ (sta->sta_stats.last_rx_data_pkts) -#define sta_rx_mgnt_pkts (sta) \ - (sta->sta_stats.rx_mgnt_pkts) - -#define sta_last_rx_mgnt_pkts (sta) \ - (sta->sta_stats.last_rx_mgnt_pkts) -#define sta_rx_beacon_pkts (sta) \ (sta->sta_stats.rx_beacon_pkts)#define sta_last_rx_beacon_pkts (sta) \ (sta->sta_stats.last_rx_beacon_pkts) -#define sta_rx_probereq_pkts (sta) \ - (sta->sta_stats.rx_probereq_pkts) - -#define sta_last_rx_probereq_pkts (sta) \ - (sta->sta_stats.last_rx_probereq_pkts) -#define sta_rx_probersp_pkts (sta) \ (sta->sta_stats.rx_probersp_pkts)#define sta_last_rx_probersp_pkts (sta) \ (sta->sta_stats.last_rx_probersp_pkts) -#define sta_rx_probersp_bm_pkts (sta) \ - (sta->sta_stats.rx_probersp_bm_pkts) - -#define sta_last_rx_probersp_bm_pkts (sta) \ - (sta->sta_stats.last_rx_probersp_bm_pkts) - -#define sta_rx_probersp_uo_pkts (sta) \ - (sta->sta_stats.rx_probersp_uo_pkts) - -#define sta_last_rx_probersp_uo_pkts (sta) \ - (sta->sta_stats.last_rx_probersp_uo_pkts) -#define sta_update_last_rx_pkts (sta) \ do { \ sta->sta_stats.last_rx_mgnt_pkts = sta->sta_stats.rx_mgnt_pkts; \
@@ -269,23 +240,6 @@ do { \ sta->sta_stats.last_rx_data_pkts = sta->sta_stats.rx_data_pkts; \ }while (0 ) -#define STA_RX_PKTS_ARG (sta) \ - sta->sta_stats.rx_mgnt_pkts \ - , sta->sta_stats.rx_ctrl_pkts \ - , sta->sta_stats.rx_data_pkts - -#define STA_LAST_RX_PKTS_ARG (sta) \ - sta->sta_stats.last_rx_mgnt_pkts \ - , sta->sta_stats.last_rx_ctrl_pkts \ - , sta->sta_stats.last_rx_data_pkts - -#define STA_RX_PKTS_DIFF_ARG (sta) \ - sta->sta_stats.rx_mgnt_pkts - sta->sta_stats.last_rx_mgnt_pkts \ - , sta->sta_stats.rx_ctrl_pkts - sta->sta_stats.last_rx_ctrl_pkts \ - , sta->sta_stats.rx_data_pkts - sta->sta_stats.last_rx_data_pkts - -#define STA_PKTS_FMT "(m:%llu, c:%llu, d:%llu)" - struct sta_priv {u8 *pallocated_stainfo_buf;u8 *pstainfo_buf;
Signature · 1 line
2.34.1