staging: r8188eu: some simple cleanups
cover staging: r8188eu: some simple cleanups
This series contains some simple cleanups in different areas of the driver.
Tested on x86_64 with Inter-Tech DMG-02.
Michael Straube (4):
staging: r8188eu: remove unused parameters from
_BeaconFunctionEnable()
staging: r8188eu: remove unused parameter from UpdateBrateTbl()
staging: r8188eu: make two functions static
staging: r8188eu: remove unnecessary return labels.
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 42 ++++++++++++++++++- drivers/staging/r8188eu/core/rtw_wlan_util.c | 40 ------------------ drivers/staging/r8188eu/hal/usb_halinit.c | 5 +-- .../staging/r8188eu/include/rtw_mlme_ext.h | 2 - .../staging/r8188eu/os_dep/osdep_service.c | 10 ++--- 5 files changed, 47 insertions(+), 52 deletions(-)
Signature · 1 line
2.37.2
PATCH 1/4 staging: r8188eu: remove unused parameters from _BeaconFunctionEnable()
The parameters 'Enable' and 'Linked' of _BeaconFunctionEnable() are unused. Remove them.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +2 -3
@@ -496,8 +496,7 @@ static int _InitBeaconParameters(struct adapter *Adapter)return 0 ; } -static void _BeaconFunctionEnable (struct adapter *Adapter, -bool Enable,bool Linked) +static void _BeaconFunctionEnable (struct adapter *Adapter) {rtw_write8 (Adapter,REG_BCN_CTRL , (BIT (4 ) |BIT (3 ) |BIT (1 )));
@@ -1043,7 +1042,7 @@ void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt)rtw_write8 (adapt,REG_RXTSF_OFFSET_CCK ,0x50 );rtw_write8 (adapt,REG_RXTSF_OFFSET_OFDM ,0x50 ); -_BeaconFunctionEnable (adapt, true, true); +_BeaconFunctionEnable (adapt);rtw_resume_tx_beacon (adapt);
Signature · 1 line
2.37.2
PATCH 2/4 staging: r8188eu: remove unused parameter from UpdateBrateTbl()
In reply to Michael StraubeThe parameter 'Adapter' of UpdateBrateTbl() is unused. Remove it.
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +1 -1
@@ -1409,7 +1409,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_frame pmlmeinfo->state |=WIFI_FW_ASSOC_SUCCESS ;/* Update Basic Rate Table for spec, 2010-12-28 , by thomas */ -UpdateBrateTbl (padapter, pmlmeinfo->network.SupportedRates); +UpdateBrateTbl (pmlmeinfo->network.SupportedRates); report_assoc_result:report_join_res (padapter, res);
drivers/staging/r8188eu/core/rtw_wlan_util.c +1 -1
@@ -222,7 +222,7 @@ void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssratmemcpy (pbssrate, supportedrates, *bssrate_len); } -void UpdateBrateTbl (struct adapter *Adapter,u8 *mbrate) +void UpdateBrateTbl (u8 *mbrate) {u8 i;u8 rate;
drivers/staging/r8188eu/include/rtw_mlme_ext.h +1 -1
@@ -393,7 +393,7 @@ extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv);unsigned char networktype_to_raid (unsigned char network_type);u8 judge_network_type (struct adapter *padapter,unsigned char *rate,int len);void get_rate_set (struct adapter *padapter,unsigned char *pbssrate,int *len); -void UpdateBrateTbl (struct adapter *padapter,u8 *mBratesOS); +void UpdateBrateTbl (u8 *mBratesOS);void UpdateBrateTblForSoftAP (u8 *bssrateset,u32 bssratelen);void Save_DM_Func_Flag (struct adapter *padapter);
Signature · 1 line
2.37.2
PATCH 3/4 staging: r8188eu: make two functions static
In reply to Michael StraubeThe functions UpdateBrateTbl() and UpdateBrateTblForSoftAP() are only used in rtw_mlme_ext.c. Make them static.
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 40 +++++++++++++++++++ drivers/staging/r8188eu/core/rtw_wlan_util.c | 40 ------------------- .../staging/r8188eu/include/rtw_mlme_ext.h | 2 - 3 files changed, 40 insertions(+), 42 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +40 -0
@@ -932,6 +932,46 @@ unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_frareturn _FAIL; } +static void UpdateBrateTbl (u8 *mbrate) +{ +u8 i; +u8 rate; + +/* 1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */ +for (i =0 ; i <NDIS_802_11_LENGTH_RATES_EX ; i++) { + rate = mbrate[i] &0x7f ; +switch (rate) { +case IEEE80211_CCK_RATE_1MB : +case IEEE80211_CCK_RATE_2MB : +case IEEE80211_CCK_RATE_5MB : +case IEEE80211_CCK_RATE_11MB : +case IEEE80211_OFDM_RATE_6MB : +case IEEE80211_OFDM_RATE_12MB : +case IEEE80211_OFDM_RATE_24MB : + mbrate[i] |=IEEE80211_BASIC_RATE_MASK ; +break ; + } + } +} + +static void UpdateBrateTblForSoftAP (u8 *bssrateset,u32 bssratelen) +{ +u8 i; +u8 rate; + +for (i =0 ; i < bssratelen; i++) { + rate = bssrateset[i] &0x7f ; +switch (rate) { +case IEEE80211_CCK_RATE_1MB : +case IEEE80211_CCK_RATE_2MB : +case IEEE80211_CCK_RATE_5MB : +case IEEE80211_CCK_RATE_11MB : + bssrateset[i] |=IEEE80211_BASIC_RATE_MASK ; +break ; + } + } +} +unsigned int OnAssocReq (struct adapter *padapter,struct recv_frame *precv_frame) {u16 capab_info;
drivers/staging/r8188eu/core/rtw_wlan_util.c +0 -40
@@ -222,46 +222,6 @@ void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssratmemcpy (pbssrate, supportedrates, *bssrate_len); } -void UpdateBrateTbl (u8 *mbrate) -{ -u8 i; -u8 rate; - -/* 1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */ -for (i =0 ; i <NDIS_802_11_LENGTH_RATES_EX ; i++) { - rate = mbrate[i] &0x7f ; -switch (rate) { -case IEEE80211_CCK_RATE_1MB : -case IEEE80211_CCK_RATE_2MB : -case IEEE80211_CCK_RATE_5MB : -case IEEE80211_CCK_RATE_11MB : -case IEEE80211_OFDM_RATE_6MB : -case IEEE80211_OFDM_RATE_12MB : -case IEEE80211_OFDM_RATE_24MB : - mbrate[i] |=IEEE80211_BASIC_RATE_MASK ; -break ; - } - } -} - -void UpdateBrateTblForSoftAP (u8 *bssrateset,u32 bssratelen) -{ -u8 i; -u8 rate; - -for (i =0 ; i < bssratelen; i++) { - rate = bssrateset[i] &0x7f ; -switch (rate) { -case IEEE80211_CCK_RATE_1MB : -case IEEE80211_CCK_RATE_2MB : -case IEEE80211_CCK_RATE_5MB : -case IEEE80211_CCK_RATE_11MB : - bssrateset[i] |=IEEE80211_BASIC_RATE_MASK ; -break ; - } - } -} -void Save_DM_Func_Flag (struct adapter *padapter) {struct hal_data_8188e *haldata = &padapter->haldata;
drivers/staging/r8188eu/include/rtw_mlme_ext.h +0 -2
@@ -393,8 +393,6 @@ extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv);unsigned char networktype_to_raid (unsigned char network_type);u8 judge_network_type (struct adapter *padapter,unsigned char *rate,int len);void get_rate_set (struct adapter *padapter,unsigned char *pbssrate,int *len); -void UpdateBrateTbl (u8 *mBratesOS); -void UpdateBrateTblForSoftAP (u8 *bssrateset,u32 bssratelen);void Save_DM_Func_Flag (struct adapter *padapter);void Restore_DM_Func_Flag (struct adapter *padapter);
Signature · 1 line
2.37.2
PATCH 4/4 staging: r8188eu: remove unnecessary return labels.
In reply to Michael StraubeRemove the RETURN labels in rtw_alloc_etherdev_with_old_priv() and rtw_alloc_etherdev() and return directly to clean up the code and improve readability.
--- drivers/staging/r8188eu/os_dep/osdep_service.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/r8188eu/os_dep/osdep_service.c +4 -6
@@ -54,14 +54,13 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, pnetdev =alloc_etherdev_mq (sizeof (struct rtw_netdev_priv_indicator ),4 );if (!pnetdev) - goto RETURN; +return NULL ; pnetdev->dev.type = &wlan_type; pnpi =netdev_priv (pnetdev); pnpi->priv = old_priv; pnpi->sizeof_priv = sizeof_priv; -RETURN:return pnetdev; }
@@ -72,19 +71,18 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv) pnetdev =alloc_etherdev_mq (sizeof (struct rtw_netdev_priv_indicator ),4 );if (!pnetdev) - goto RETURN; +return NULL ; pnpi =netdev_priv (pnetdev); pnpi->priv =vzalloc (sizeof_priv);if (!pnpi->priv) {free_netdev (pnetdev); - pnetdev =NULL ; - goto RETURN; +return NULL ; } pnpi->sizeof_priv = sizeof_priv; -RETURN: +return pnetdev; }
Signature · 1 line
2.37.2
Quoted 12 lines · Michael Straube
This series contains some simple cleanups in different areas of the driver.
Tested on
x86_64with Inter-Tech DMG-02.Michael Straube (4):
staging: r8188eu: remove unused parameters from
_BeaconFunctionEnable()
staging: r8188eu: remove unused parameter fromUpdateBrateTbl()
staging: r8188eu: make two functions static
staging: r8188eu: remove unnecessary return labels.
Quoted 7 lines
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 42 ++++++++++++++++++- drivers/staging/r8188eu/core/rtw_wlan_util.c | 40 ------------------ drivers/staging/r8188eu/hal/usb_halinit.c | 5 +-- .../staging/r8188eu/include/rtw_mlme_ext.h | 2 - .../staging/r8188eu/os_dep/osdep_service.c | 10 ++--- 5 files changed, 47 insertions(+), 52 deletions(-)