staging: rtl8723bs: clean up braces

Add or remove braces or remove lines to fix coding style issues and
clear checkpatch.

WARNING: braces {} are not necessary for single statement blocks
WARNING: braces {} are not necessary for any arm of this statement
CHECK: Unbalanced braces around else statement
CHECK: braces {} should be used on all arms of this statement
CHECK: Blank lines aren't necessary before a close brace '}'
CHECK: Blank lines aren't necessary after an open brace '{'

Signed-off-by: Ross Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201110041008.15847-2-ross.schm.dev@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index 894e7beae96f0d88fb47af30b471edc0439c35d3..85f1164f79607d6a4a410fb0df0cd1b93b6853fc 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -1336,8 +1336,9 @@ static sint aes_cipher(u8 *key, uint      hdrlen,
                        hdrlen += 2;
 
                qc_exists = 1;
-       } else
+       } else {
                qc_exists = 0;
+       }
 
        pn_vector[0] = pframe[hdrlen];
        pn_vector[1] = pframe[hdrlen+1];
@@ -1393,9 +1394,9 @@ static sint aes_cipher(u8 *key, uint      hdrlen,
        if (payload_remainder > 0) {
                for (j = 0; j < 16; j++)
                        padded_buffer[j] = 0x00;
-               for (j = 0; j < payload_remainder; j++) {
+               for (j = 0; j < payload_remainder; j++)
                        padded_buffer[j] = pframe[payload_index++];
-               }
+
                bitwise_xor(aes_out, padded_buffer, chain_buffer);
                aes128k128d(key, chain_buffer, aes_out);
        }
@@ -1576,20 +1577,21 @@ static sint aes_decipher(u8 *key, uint  hdrlen,
            ((frtype|frsubtype) == WIFI_DATA_CFPOLL) ||
            ((frtype|frsubtype) == WIFI_DATA_CFACKPOLL)) {
                qc_exists = 1;
-               if (hdrlen !=  WLAN_HDR_A3_QOS_LEN) {
+               if (hdrlen !=  WLAN_HDR_A3_QOS_LEN)
                        hdrlen += 2;
-               }
+
        } else if ((frtype == WIFI_DATA) && /* only for data packet . add for CONFIG_IEEE80211W, none 11w also can use */
                   ((frsubtype == 0x08) ||
                   (frsubtype == 0x09) ||
                   (frsubtype == 0x0a) ||
                   (frsubtype == 0x0b))) {
-               if (hdrlen !=  WLAN_HDR_A3_QOS_LEN) {
+               if (hdrlen !=  WLAN_HDR_A3_QOS_LEN)
                        hdrlen += 2;
-               }
+
                qc_exists = 1;
-       } else
+       } else {
                qc_exists = 0;
+       }
 
        /*  now, decrypt pframe with hdrlen offset and plen long */
 
@@ -1623,9 +1625,9 @@ static sint aes_decipher(u8 *key, uint    hdrlen,
 
                for (j = 0; j < 16; j++)
                        padded_buffer[j] = 0x00;
-               for (j = 0; j < payload_remainder; j++) {
+               for (j = 0; j < payload_remainder; j++)
                        padded_buffer[j] = pframe[payload_index+j];
-               }
+
                aes128k128d(key, ctr_preload, aes_out);
                bitwise_xor(aes_out, padded_buffer, chain_buffer);
                for (j = 0; j < payload_remainder; j++)
@@ -1690,9 +1692,9 @@ static sint aes_decipher(u8 *key, uint    hdrlen,
        if (payload_remainder > 0) {
                for (j = 0; j < 16; j++)
                        padded_buffer[j] = 0x00;
-               for (j = 0; j < payload_remainder; j++) {
+               for (j = 0; j < payload_remainder; j++)
                        padded_buffer[j] = message[payload_index++];
-               }
+
                bitwise_xor(aes_out, padded_buffer, chain_buffer);
                aes128k128d(key, chain_buffer, aes_out);
        }
@@ -1736,9 +1738,9 @@ static sint aes_decipher(u8 *key, uint    hdrlen,
 
                for (j = 0; j < 16; j++)
                        padded_buffer[j] = 0x00;
-               for (j = 0; j < payload_remainder; j++) {
+               for (j = 0; j < payload_remainder; j++)
                        padded_buffer[j] = message[payload_index+j];
-               }
+
                aes128k128d(key, ctr_preload, aes_out);
                bitwise_xor(aes_out, padded_buffer, chain_buffer);
                for (j = 0; j < payload_remainder; j++)
@@ -1758,9 +1760,8 @@ static sint aes_decipher(u8 *key, uint    hdrlen,
 
        for (j = 0; j < 16; j++)
                padded_buffer[j] = 0x00;
-       for (j = 0; j < 8; j++) {
+       for (j = 0; j < 8; j++)
                padded_buffer[j] = message[j+hdrlen+8+plen-8];
-       }
 
        aes128k128d(key, ctr_preload, aes_out);
        bitwise_xor(aes_out, padded_buffer, chain_buffer);
@@ -1856,8 +1857,9 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
                                        res = _FAIL;
                                        goto exit;
                                }
-                       } else
+                       } else {
                                prwskey = &stainfo->dot118021x_UncstKey.skey[0];
+                       }
 
                        length = ((union recv_frame *)precvframe)->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len;
 
@@ -1941,11 +1943,13 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
                if (!memcmp(mic, pframe+pattrib->pkt_len-8, 8)) {
                        pmlmeext->mgnt_80211w_IPN_rx = temp_ipn;
                        res = _SUCCESS;
-               } else
+               } else {
                        DBG_871X("BIP MIC error!\n");
+               }
 
-       } else
+       } else {
                res = RTW_RX_HANDLED;
+       }
 BIP_exit:
 
        kfree(BIP_AAD);

diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
index f24ad8b1a400d482d6ef100a4e4b1e3780a050cb..6e9785c21cf8736ce8247a1122b31697ce4c9873 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
@@ -154,7 +154,6 @@ u32 _rtw_free_sta_priv(struct       sta_priv *pstapriv)
        int     index;
 
        if (pstapriv) {
-
                /*delete all reordering_ctrl_timer              */
                spin_lock_bh(&pstapriv->sta_hash_lock);
                for (index = 0; index < NUM_STA; index++) {
@@ -179,7 +178,6 @@ u32 _rtw_free_sta_priv(struct       sta_priv *pstapriv)
                kfree_sta_priv_lock(pstapriv);
 
                vfree(pstapriv->pallocated_stainfo_buf);
-
        }
        return _SUCCESS;
 }
@@ -241,9 +239,8 @@ struct      sta_info *rtw_alloc_stainfo(struct      sta_priv *pstapriv, u8 *hwaddr)
 /*  In this case, this packet will be dropped by recv_decache function if we use the 0x00 as the default value for tid_rxseq variable. */
 /*  So, we initialize the tid_rxseq variable as the 0xffff. */
 
-               for (i = 0; i < 16; i++) {
+               for (i = 0; i < 16; i++)
                        memcpy(&psta->sta_recvpriv.rxcache.tid_rxseq[i], &wRxSeqInitialValue, 2);
-               }
 
                RT_TRACE(
                        _module_rtl871x_sta_mgt_c_,
@@ -292,7 +289,6 @@ struct      sta_info *rtw_alloc_stainfo(struct      sta_priv *pstapriv, u8 *hwaddr)
                spin_unlock_bh(&(pstapriv->sta_hash_lock));
                /* alloc mac id for non-bc/mc station, */
                rtw_alloc_macid(pstapriv->padapter, psta);
-
        }
 
 exit:
@@ -420,7 +416,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)
                }
 
                spin_unlock_bh(&ppending_recvframe_queue->lock);
-
        }
 
        if (!(psta->state & WIFI_AP_STATE))
@@ -496,7 +491,6 @@ void rtw_free_all_stainfo(struct adapter *padapter)
 
                        if (pbcmc_stainfo != psta)
                                rtw_free_stainfo(padapter, psta);
-
                }
        }
 
@@ -528,7 +522,6 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
        plist = get_next(phead);
 
        while (phead != plist) {
-
                psta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
 
                if ((!memcmp(psta->hwaddr, addr, ETH_ALEN)))
@@ -545,7 +538,6 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
 
 u32 rtw_init_bcmc_stainfo(struct adapter *padapter)
 {
-
        struct sta_info *psta;
        u32 res = _SUCCESS;
        NDIS_802_11_MAC_ADDRESS bcast_addr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -598,7 +590,6 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
                                match = true;
                                break;
                        }
-
        }
        spin_unlock_bh(&(pacl_node_q->lock));
 

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index f28536fbc4fb3052dbb8594b6c40e31845c962f2..2fedaa1b4870b6b99720442f5a2da8e2f87c8d9c 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -957,9 +957,10 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_
        if (pmlmeext->cur_channel > 14) {
                if ((pregistrypriv->bw_mode & 0xf0) > 0)
                        cbw40_enable = 1;
-       } else
+       } else {
                if ((pregistrypriv->bw_mode & 0x0f) > 0)
                        cbw40_enable = 1;
+       }
 
        if ((pHT_info->infos[0] & BIT(2)) && cbw40_enable) {
                new_bwmode = CHANNEL_WIDTH_40;
@@ -991,8 +992,9 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_
 
                /* update HT info also */
                HT_info_handler(padapter, pIE);
-       } else
+       } else {
                pmlmeinfo->bwmode_updated = false;
+       }
 
        if (true == pmlmeinfo->bwmode_updated) {
                struct sta_info *psta;
@@ -1521,8 +1523,9 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)
                }
 
                return false;
-       } else
+       } else {
                return false;
+       }
 }
 
 int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps, u8 bwmode)
@@ -1626,8 +1629,9 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
                        } else if (!memcmp(pIE->data, AIRGOCAP_OUI, 3)) {
                                DBG_871X("link to Airgo Cap\n");
                                return HT_IOT_PEER_AIRGO;
-                       } else
+                       } else {
                                break;
+                       }
 
                default:
                        break;
@@ -1697,23 +1701,24 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)
                }
        }
 
-       if (updateCap & cIBSS)
+       if (updateCap & cIBSS) {
                /* Filen: See 802.11-2007 p.91 */
                pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME;
-       else {
+       } else {
                /* Filen: See 802.11-2007 p.90 */
-               if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N | WIRELESS_11A | WIRELESS_11_5N | WIRELESS_11AC))
+               if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N | WIRELESS_11A | WIRELESS_11_5N | WIRELESS_11AC)) {
                        pmlmeinfo->slotTime = SHORT_SLOT_TIME;
-               else if (pmlmeext->cur_wireless_mode & (WIRELESS_11G)) {
+               } else if (pmlmeext->cur_wireless_mode & (WIRELESS_11G)) {
                        if ((updateCap & cShortSlotTime) /* && (!(pMgntInfo->pHTInfo->RT2RT_HT_Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */)
                                /*  Short Slot Time */
                                pmlmeinfo->slotTime = SHORT_SLOT_TIME;
                        else
                                /*  Long Slot Time */
                                pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME;
-               } else
+               } else {
                        /* B Mode */
                        pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME;
+               }
        }
 
        rtw_hal_set_hwreg(Adapter, HW_VAR_SLOT_TIME, &pmlmeinfo->slotTime);

diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index eba29abfa8322d761dd419bcd5851aa2ceaffd26..af23c649a870e96e16f1cf54d8314217a6c97bac 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -366,9 +366,9 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *
        /*              Other fragments are protected by previous fragment. */
        /*              So we only need to check the length of first fragment. */
        if (pmlmeext->cur_wireless_mode < WIRELESS_11_24N  || padapter->registrypriv.wifi_spec) {
-               if (sz > padapter->registrypriv.rts_thresh)
+               if (sz > padapter->registrypriv.rts_thresh) {
                        pattrib->vcs_mode = RTS_CTS;
-               else {
+               } else {
                        if (pattrib->rtsen)
                                pattrib->vcs_mode = RTS_CTS;
                        else if (pattrib->cts2self)
@@ -676,8 +676,9 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
                memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
                memcpy(pattrib->ta, get_bssid(pmlmepriv), ETH_ALEN);
                DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_ap);
-       } else
+       } else {
                DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_unknown);
+       }
 
        pattrib->pktlen = pktfile.pkt_len;
 
@@ -923,8 +924,9 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
                default:
                                break;
                }
-       } else
+       } else {
                RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_, ("### xmitframe_hwencrypt\n"));
+       }
 
        return _SUCCESS;
 }
@@ -1202,8 +1204,9 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram
                        ClearMFrag(mem_start);
 
                        break;
-               } else
+               } else {
                        RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__));
+               }
 
                addr = (SIZE_PTR)(pframe);
 
@@ -1445,17 +1448,18 @@ void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
        case AUTO_VCS:
        default:
                perp = rtw_get_ie(ie, _ERPINFO_IE_, &erp_len, ie_len);
-               if (!perp)
+               if (!perp) {
                        pxmitpriv->vcs = NONE_VCS;
-               else {
+               } else {
                        protection = (*(perp + 2)) & BIT(1);
                        if (protection) {
                                if (pregistrypriv->vcs_type == RTS_CTS)
                                        pxmitpriv->vcs = RTS_CTS;
                                else
                                        pxmitpriv->vcs = CTS_TO_SELF;
-                       } else
+                       } else {
                                pxmitpriv->vcs = NONE_VCS;
+                       }
                }
 
                break;
@@ -1508,8 +1512,9 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpriv,
                        DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__);
                        rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
                }
-       } else
+       } else {
                DBG_871X("%s fail, no xmitbuf available !!!\n", __func__);
+       }
 
        return pxmitbuf;
 }