staging: rtl8192u: ieee80211: Remove braces for single line blocks

Remove braces around those `if` and `for` blocks which contain a
single line and therefore fix the Checkpatch warning of the
following type:

"WARNING: braces {} are not necessary for single statement blocks"

Signed-off-by: Atul Gopinathan <atulgopinathan@gmail.com>
Link: https://lore.kernel.org/r/20210310104353.14531-1-atulgopinathan@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index b6fee72..b0e01ee 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -612,9 +612,9 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
                pHTInfo->RxReorderDropCounter++;
                {
                        int i;
-                       for (i = 0; i < prxb->nr_subframes; i++) {
+                       for (i = 0; i < prxb->nr_subframes; i++)
                                dev_kfree_skb(prxb->subframes[i]);
-                       }
+
                        kfree(prxb);
                        prxb = NULL;
                }
@@ -632,11 +632,11 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
                pTS->rx_indicate_seq = (pTS->rx_indicate_seq + 1) % 4096;
                bMatchWinStart = true;
        } else if (SN_LESS(WinEnd, SeqNum)) {
-               if (SeqNum >= (WinSize - 1)) {
+               if (SeqNum >= (WinSize - 1))
                        pTS->rx_indicate_seq = SeqNum + 1 - WinSize;
-               } else {
+               else
                        pTS->rx_indicate_seq = 4095 - (WinSize - (SeqNum + 1)) + 1;
-               }
+
                IEEE80211_DEBUG(IEEE80211_DL_REORDER, "Window Shift! IndicateSeq: %d, NewSeq: %d\n", pTS->rx_indicate_seq, SeqNum);
        }
 
@@ -674,9 +674,9 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
                                list_add_tail(&pReorderEntry->List, &ieee->RxReorder_Unused_List);
                                {
                                        int i;
-                                       for (i = 0; i < prxb->nr_subframes; i++) {
+                                       for (i = 0; i < prxb->nr_subframes; i++)
                                                dev_kfree_skb(prxb->subframes[i]);
-                                       }
+
                                        kfree(prxb);
                                        prxb = NULL;
                                }
@@ -693,9 +693,9 @@ static void RxReorderIndicatePacket(struct ieee80211_device *ieee,
                        IEEE80211_DEBUG(IEEE80211_DL_ERR, "RxReorderIndicatePacket(): There is no reorder entry!! Packet is dropped!!\n");
                        {
                                int i;
-                               for (i = 0; i < prxb->nr_subframes; i++) {
+                               for (i = 0; i < prxb->nr_subframes; i++)
                                        dev_kfree_skb(prxb->subframes[i]);
-                               }
+
                                kfree(prxb);
                                prxb = NULL;
                        }
@@ -785,13 +785,12 @@ static u8 parse_subframe(struct ieee80211_device *ieee,
                bIsAggregateFrame = true;
        }
 
-       if (IEEE80211_QOS_HAS_SEQ(fc)) {
+       if (IEEE80211_QOS_HAS_SEQ(fc))
                LLCOffset += 2;
-       }
 
-       if (rx_stats->bContainHTC) {
+       if (rx_stats->bContainHTC)
                LLCOffset += HTCLNG;
-       }
+
        // Null packet, don't indicate it to upper layer
        ChkLength = LLCOffset;/* + (Frame_WEP(frame)!=0 ?Adapter->MgntInfo.SecurityInfo.EncryptionHeadOverhead:0);*/
 
@@ -855,13 +854,11 @@ static u8 parse_subframe(struct ieee80211_device *ieee,
 
                        if (skb->len != 0) {
                                nPadding_Length = 4 - ((nSubframe_Length + ETHERNET_HEADER_SIZE) % 4);
-                               if (nPadding_Length == 4) {
+                               if (nPadding_Length == 4)
                                        nPadding_Length = 0;
-                               }
 
-                               if (skb->len < nPadding_Length) {
+                               if (skb->len < nPadding_Length)
                                        return 0;
-                               }
 
                                skb_pull(skb, nPadding_Length);
                        }
@@ -1248,9 +1245,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                TID = Frame_QoSTID(skb->data);
                SeqNum = WLAN_GET_SEQ_SEQ(sc);
                GetTs(ieee, (struct ts_common_info **)&pTS, hdr->addr2, TID, RX_DIR, true);
-               if (TID != 0 && TID != 3) {
+               if (TID != 0 && TID != 3)
                        ieee->bis_any_nonbepkts = true;
-               }
        }
 //added by amy for reorder
        /* skb: hdr + (possible reassembled) full plaintext payload */
@@ -1262,9 +1258,9 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
        /* qos data packets & reserved bit is 1 */
        if (parse_subframe(ieee, skb, rx_stats, rxb, src, dst) == 0) {
                /* only to free rxb, and not submit the packets to upper layer */
-               for (i = 0; i < rxb->nr_subframes; i++) {
+               for (i = 0; i < rxb->nr_subframes; i++)
                        dev_kfree_skb(rxb->subframes[i]);
-               }
+
                kfree(rxb);
                rxb = NULL;
                goto rx_dropped;
@@ -1523,11 +1519,9 @@ static inline void ieee80211_extract_country_ie(
                // some AP (e.g. Cisco 1242) don't include country IE in their
                // probe response frame.
                //
-               if (IS_EQUAL_CIE_SRC(ieee, addr2)) {
+               if (IS_EQUAL_CIE_SRC(ieee, addr2))
                        UPDATE_CIE_WATCHDOG(ieee);
-               }
        }
-
 }
 
 int ieee80211_parse_info_param(struct ieee80211_device *ieee,

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index bd89146..96e6aaf 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -301,9 +301,9 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
        if (is_multicast_ether_addr(hdr->addr1))
                return;
        //check packet and mode later
-       if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) {
+       if (!ieee->GetNmodeSupportBySecCfg(ieee->dev))
                return;
-       }
+
        if (pHTInfo->bCurrentAMPDUEnable) {
                if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1, skb->priority, TX_DIR, true)) {
                        printk("===>can't get TS\n");

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
index 22373c0..78cc8f3 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
@@ -184,9 +184,8 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,
        //      printk("WPA IE\n");
                u8 *p = buf;
                p += sprintf(p, "wpa_ie=");
-               for (i = 0; i < network->wpa_ie_len; i++) {
+               for (i = 0; i < network->wpa_ie_len; i++)
                        p += sprintf(p, "%02x", network->wpa_ie[i]);
-               }
 
                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = IWEVCUSTOM;
@@ -199,9 +198,8 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,
 
                u8 *p = buf;
                p += sprintf(p, "rsn_ie=");
-               for (i = 0; i < network->rsn_ie_len; i++) {
+               for (i = 0; i < network->rsn_ie_len; i++)
                        p += sprintf(p, "%02x", network->rsn_ie[i]);
-               }
 
                memset(&iwe, 0, sizeof(iwe));
                iwe.cmd = IWEVCUSTOM;