staging: rtl8188eu: remove else after break or return
PATCH 1/3 staging: rtl8188eu: remove else after break or return
Remove unnecessary else after break or return to improve readability and clear checkpatch warnings.
WARNING: else is not generally useful after a break or return
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_efuse.c | 9 ++-- .../staging/rtl8188eu/core/rtw_ieee80211.c | 18 +++---- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 49 +++++++++---------- .../staging/rtl8188eu/core/rtw_wlan_util.c | 8 ++- drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 +- drivers/staging/rtl8188eu/hal/odm.c | 7 +-- drivers/staging/rtl8188eu/hal/phy.c | 41 ++++++++-------- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 6 +-- 8 files changed, 65 insertions(+), 77 deletions(-)
drivers/staging/rtl8188eu/core/rtw_efuse.c +4 -5
@@ -497,8 +497,8 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, stif (!PgWriteSuccess)return false; -else - efuse_addr =Efuse_GetCurrentSize (pAdapter); + + efuse_addr =Efuse_GetCurrentSize (pAdapter); }else { efuse_addr = efuse_addr + (pFixPkt->word_cnts *2 ) +1 ; }
@@ -713,10 +713,9 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, uif (ALL_WORDS_DISABLED (efuse_data)) { ret = false;break ; - }else { - curPkt.offset = ((cur_header &0xE0 ) >>5 ) | ((efuse_data &0xF0 ) >>1 ); - curPkt.word_en = efuse_data &0x0F ; } + curPkt.offset = ((cur_header &0xE0 ) >>5 ) | ((efuse_data &0xF0 ) >>1 ); + curPkt.word_en = efuse_data &0x0F ; }else { cur_header = efuse_data; curPkt.offset = (cur_header >>4 ) &0x0F ;
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +7 -11
@@ -157,11 +157,10 @@ u8 *rtw_get_ie(u8 *pbuf, int index, uint *len, int limit)if (*p == index) { *len = *(p +1 );return p; - }else { - tmp = *(p +1 ); - p += (tmp +2 ); - i += (tmp +2 ); } + tmp = *(p +1 ); + p += (tmp +2 ); + i += (tmp +2 );if (i >= limit)break ; }
@@ -295,10 +294,9 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit) goto check_next_ie; *wpa_ie_len = *(pbuf +1 );return pbuf; - }else { - *wpa_ie_len =0 ; -return NULL ; } + *wpa_ie_len =0 ; +return NULL ; check_next_ie: limit_new = limit - (pbuf - pie) -2 - len;
@@ -596,9 +594,8 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen) cnt += in_ie[cnt +1 ] +2 ;break ; - }else { - cnt += in_ie[cnt +1 ] +2 ;/* goto next */ } + cnt += in_ie[cnt +1 ] +2 ;/* goto next */ }return wpsie_ptr; }
@@ -642,9 +639,8 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_attif (len_attr) *len_attr = attr_len;break ; - }else { - attr_ptr += attr_len;/* goto next */ } + attr_ptr += attr_len;/* goto next */ }return target_attr_ptr; }
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +23 -26
92 lines not on this page · raw message
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +3 -5
@@ -1247,9 +1247,8 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)if (ralink_vendor_flag) {DBG_88E ("link to Tenda W311R AP\n" );return HT_IOT_PEER_TENDA ; - }else { -DBG_88E ("Capture EPIGRAM_OUI\n" ); } +DBG_88E ("Capture EPIGRAM_OUI\n" ); }else {break ; }
@@ -1266,10 +1265,9 @@ unsigned char check_assoc_AP(u8 *pframe, uint len) }else if (ralink_vendor_flag && epigram_vendor_flag) {DBG_88E ("link to Tenda W311R AP\n" );return HT_IOT_PEER_TENDA ; - }else { -DBG_88E ("link to new AP\n" ); -return HT_IOT_PEER_UNKNOWN ; } +DBG_88E ("link to new AP\n" ); +return HT_IOT_PEER_UNKNOWN ; }void update_IOT_info (struct adapter *padapter)
drivers/staging/rtl8188eu/core/rtw_xmit.c +2 -2
@@ -1022,10 +1022,10 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, structClearMFrag (mem_start);break ; - }else { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n" , __func__)); } +RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n" , __func__)); + addr = (size_t )(pframe); mem_start = (unsigned char *)round_up (addr,4 ) + hw_hdr_offset;
drivers/staging/rtl8188eu/hal/odm.c +4 -3
@@ -967,10 +967,11 @@ void ODM_TXPowerTrackingCheck(struct odm_dm_struct *pDM_Odm) pDM_Odm->RFCalibrateInfo.TM_Trigger =1 ;return ; - }else { -rtl88eu_dm_txpower_tracking_callback_thermalmeter (Adapter); - pDM_Odm->RFCalibrateInfo.TM_Trigger =0 ; } + +rtl88eu_dm_txpower_tracking_callback_thermalmeter (Adapter); + pDM_Odm->RFCalibrateInfo.TM_Trigger =0 ; + }/* 3============================================================ */
drivers/staging/rtl8188eu/hal/phy.c +20 -21
57 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +2 -4
@@ -596,9 +596,8 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ieset_fwstate (&padapter->mlmepriv,WIFI_UNDER_WPS ); cnt += buf[cnt+1 ]+2 ;break ; - }else { - cnt += buf[cnt+1 ]+2 ;/* goto next */ } + cnt += buf[cnt+1 ]+2 ;/* goto next */ } } }
@@ -773,8 +772,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev,DBG_88E ("[rtw_wx_set_pmkid] IW_PMKSA_ADD!\n" );if (!memcmp (strIssueBssid, strZeroMacAddress,ETH_ALEN ))return ret; -else - ret = true; + ret = true; blInserted = false;/* overwrite PMKID */
Signature · 1 line
2.24.1
PATCH 2/3 staging: rtl8188eu: remove redundant defines
Remove redundant defines from hal8188e_phy_cfg.h and rtl8188e_dm.h. All of them are defined in odm.h with the same values.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/include/hal8188e_phy_cfg.h | 5 ----- drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-)
drivers/staging/rtl8188eu/include/hal8188e_phy_cfg.h +0 -5
@@ -15,11 +15,6 @@#define MAX_TXPWR_IDX_NMODE_92S 63#define Reset_Cnt_Limit 3 -#define IQK_MAC_REG_NUM 4 -#define IQK_ADDA_REG_NUM 16 -#define IQK_BB_REG_NUM 9 -#define HP_THERMAL_NUM 8 -#define MAX_AGGR_NUM 0x07
drivers/staging/rtl8188eu/include/rtl8188e_dm.h +1 -6
@@ -10,12 +10,7 @@ enum{ UP_LINK, DOWN_LINK, }; -/* duplicate code,will move to ODM ######### */ -#define IQK_MAC_REG_NUM 4 -#define IQK_ADDA_REG_NUM 16 -#define IQK_BB_REG_NUM 9 -#define HP_THERMAL_NUM 8 -/* duplicate code,will move to ODM ######### */ +struct dm_priv {u8 DM_Type;u8 DMFlag;
Signature · 1 line
2.24.1
PATCH 3/3 staging: rtl8188eu: remove unused enum and defines
In reply to Michael StraubeIQK_BB_REG_NUM_MAX, RTL8711_RF_MAX_SENS, RTL8711_RF_DEF_SENS, NUM_REGULATORYS and enum _RTL8712_RF_MIMO_CONFIG_ are not used in the driver code, remove them.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/include/odm.h | 1 - drivers/staging/rtl8188eu/include/rtw_rf.h | 16 ---------------- 2 files changed, 17 deletions(-)
drivers/staging/rtl8188eu/include/odm.h +0 -1
@@ -239,7 +239,6 @@ struct odm_rate_adapt {#define IQK_MAC_REG_NUM 4#define IQK_ADDA_REG_NUM 16 -#define IQK_BB_REG_NUM_MAX 10#define IQK_BB_REG_NUM 9#define HP_THERMAL_NUM 8
drivers/staging/rtl8188eu/include/rtw_rf.h +0 -16
@@ -19,9 +19,6 @@#define SHORT_SLOT_TIME 9#define NON_SHORT_SLOT_TIME 20 -#define RTL8711_RF_MAX_SENS 6 -#define RTL8711_RF_DEF_SENS 4 -/* We now define the following channels as the max channels in each * channel plan. */
@@ -30,8 +27,6 @@#define MAX_CHANNEL_NUM_2G 14#define MAX_CHANNEL_NUM 14/* 2.4 GHz only */ -#define NUM_REGULATORYS 1 -/* Country codes */ #define USA 0x555320#define EUROPE 0x1/* temp, should be provided later */
@@ -74,17 +69,6 @@ enum _REG_PREAMBLE_MODE { PREAMBLE_SHORT = 3, }; -enum _RTL8712_RF_MIMO_CONFIG_ { -RTL8712_RFCONFIG_1T =0x10 , -RTL8712_RFCONFIG_2T =0x20 , -RTL8712_RFCONFIG_1R =0x01 , -RTL8712_RFCONFIG_2R =0x02 , -RTL8712_RFCONFIG_1T1R =0x11 , -RTL8712_RFCONFIG_1T2R =0x12 , -RTL8712_RFCONFIG_TURBO =0x92 , -RTL8712_RFCONFIG_2T2R =0x22 -}; -enum rf90_radio_path {RF90_PATH_A =0 ,/* Radio Path A */ RF90_PATH_B =1 ,/* Radio Path B */
Signature · 1 line
2.24.1