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 <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200118173343.32405-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 0b86ae8..c525682 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -497,8 +497,8 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st
 
                        if (!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, u
                                if (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;

diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 1344d36..29f6154 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -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_att
                        if (len_attr)
                                *len_attr = attr_len;
                        break;
-               } else {
-                       attr_ptr += attr_len; /* goto next */
                }
+               attr_ptr += attr_len; /* goto next */
        }
        return target_attr_ptr;
 }

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 16cb5b3..36841d2 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -1865,6 +1865,7 @@ unsigned int send_beacon(struct adapter *padapter)
        int issue = 0;
        int poll = 0;
        unsigned long start = jiffies;
+       u32 passing_time;
 
        rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
        do {
@@ -1883,15 +1884,14 @@ unsigned int send_beacon(struct adapter *padapter)
                DBG_88E("%s fail! %u ms\n", __func__,
                        jiffies_to_msecs(jiffies - start));
                return _FAIL;
-       } else {
-               u32 passing_time = jiffies_to_msecs(jiffies - start);
-
-               if (passing_time > 100 || issue > 3)
-                       DBG_88E("%s success, issue:%d, poll:%d, %u ms\n",
-                               __func__, issue, poll,
-                               jiffies_to_msecs(jiffies - start));
-               return _SUCCESS;
        }
+       passing_time = jiffies_to_msecs(jiffies - start);
+
+       if (passing_time > 100 || issue > 3)
+               DBG_88E("%s success, issue:%d, poll:%d, %u ms\n",
+                       __func__, issue, poll,
+                       jiffies_to_msecs(jiffies - start));
+       return _SUCCESS;
 }
 
 /****************************************************************************
@@ -2864,10 +2864,9 @@ static unsigned int OnAuthClient(struct adapter *padapter,
                        set_link_timer(pmlmeext, REAUTH_TO);
 
                        return _SUCCESS;
-               } else {
-                       /*  open system */
-                       go2asoc = 1;
                }
+               /*  open system */
+               go2asoc = 1;
        } else if (seq == 4) {
                if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared)
                        go2asoc = 1;
@@ -3453,14 +3452,13 @@ static unsigned int OnDeAuth(struct adapter *padapter,
                }
 
                return _SUCCESS;
-       } else
+       }
 #endif
-       {
-               DBG_88E_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM\n",
-                             reason, GetAddr3Ptr(pframe));
+       DBG_88E_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM\n",
+                     reason, GetAddr3Ptr(pframe));
+
+       receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
 
-               receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
-       }
        pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
        return _SUCCESS;
 }
@@ -3507,14 +3505,13 @@ static unsigned int OnDisassoc(struct adapter *padapter,
                }
 
                return _SUCCESS;
-       } else
+       }
 #endif
-       {
-               DBG_88E_LEVEL(_drv_always_, "ap recv disassoc reason code(%d) sta:%pM\n",
-                             reason, GetAddr3Ptr(pframe));
+       DBG_88E_LEVEL(_drv_always_, "ap recv disassoc reason code(%d) sta:%pM\n",
+                     reason, GetAddr3Ptr(pframe));
+
+       receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
 
-               receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
-       }
        pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
        return _SUCCESS;
 }
@@ -5277,10 +5274,10 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)
                        write_cam(padapter, cam_id, ctrl, pparm->addr, pparm->key);
 
                        return H2C_SUCCESS_RSP;
-               } else {
-                       DBG_88E("r871x_set_stakey_hdl(): sta has been free\n");
-                       return H2C_REJECTED;
                }
+
+               DBG_88E("r871x_set_stakey_hdl(): sta has been free\n");
+               return H2C_REJECTED;
        }
 
        /* below for sta mode */

diff --git a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
index af8a79c..6df873e 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8188eu/core/rtw_wlan_util.c
@@ -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)

diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index c375916..258531b 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -1022,10 +1022,10 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
                        ClearMFrag(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;

diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c
index 4e2f6cb..7489491 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -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============================================================ */

diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 51c40ab..afaf9e5 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -923,27 +923,27 @@ static bool simularity_compare(struct adapter *adapt, s32 resulta[][8],
                        }
                }
                return result;
-       } else {
-               if (!(sim_bitmap & 0x03)) {                /* path A TX OK */
-                       for (i = 0; i < 2; i++)
-                               resulta[3][i] = resulta[c1][i];
-               }
-               if (!(sim_bitmap & 0x0c)) {                /* path A RX OK */
-                       for (i = 2; i < 4; i++)
-                               resulta[3][i] = resulta[c1][i];
-               }
+       }
 
-               if (!(sim_bitmap & 0x30)) { /* path B TX OK */
-                       for (i = 4; i < 6; i++)
-                               resulta[3][i] = resulta[c1][i];
-               }
+       if (!(sim_bitmap & 0x03)) {                /* path A TX OK */
+               for (i = 0; i < 2; i++)
+                       resulta[3][i] = resulta[c1][i];
+       }
+       if (!(sim_bitmap & 0x0c)) {                /* path A RX OK */
+               for (i = 2; i < 4; i++)
+                       resulta[3][i] = resulta[c1][i];
+       }
 
-               if (!(sim_bitmap & 0xc0)) { /* path B RX OK */
-                       for (i = 6; i < 8; i++)
-                               resulta[3][i] = resulta[c1][i];
-               }
-               return false;
+       if (!(sim_bitmap & 0x30)) { /* path B TX OK */
+               for (i = 4; i < 6; i++)
+                       resulta[3][i] = resulta[c1][i];
+       }
+
+       if (!(sim_bitmap & 0xc0)) { /* path B RX OK */
+               for (i = 6; i < 8; i++)
+                       resulta[3][i] = resulta[c1][i];
        }
+       return false;
 }
 
 static void phy_iq_calibrate(struct adapter *adapt, s32 result[][8],
@@ -1053,10 +1053,9 @@ static void phy_iq_calibrate(struct adapter *adapt, s32 result[][8],
                                result[t][3] = (phy_query_bb_reg(adapt, rRx_Power_After_IQK_A_2,
                                                                 bMaskDWord)&0x3FF0000)>>16;
                        break;
-               } else {
-                       ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
-                                    ("Path A Rx IQK Fail!!\n"));
                }
+               ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
+                            ("Path A Rx IQK Fail!!\n"));
        }
 
        if (path_a_ok == 0x00) {

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 47f4cc6..9b6ea86 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -596,9 +596,8 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie
                                        set_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 */