[PATCH v3 2/3] staging: rtl8723bs: Resolve the checkpatch error: else should follow close brace '}'

[Shobhit Kukreti]

Cleaned up the code to resolve the checkpatch error else should follow
close brace '}' from the following files:

mlme_linux.c
recv_linux.c
sdio_intf.c

Signed-off-by: Shobhit Kukreti <shobhitkukr...@gmail.com>
---
 drivers/staging/rtl8723bs/os_dep/mlme_linux.c |  6 ++----
 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 21 +++++++--------------
 drivers/staging/rtl8723bs/os_dep/sdio_intf.c  |  9 +++------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c 
b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
index 4631b68..6a5ab35 100644
--- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
@@ -48,8 +48,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)
        if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
                (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) {
                rtw_cfg80211_ibss_indicate_connect(adapter);
-       }
-       else
+       } else
                rtw_cfg80211_indicate_connect(adapter);
 
        rtw_indicate_wx_assoc_event(adapter);
@@ -104,8 +103,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)
                adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
                adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
 
-       }
-       else {
+       } else {
                /* reset values in securitypriv */
 
                /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */
diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c 
b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
index a2055f6..aab0195 100644
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
@@ -62,15 +62,13 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 
nSubframe_Length, u8
        if (sub_skb) {
                skb_reserve(sub_skb, 12);
                skb_put_data(sub_skb, (pdata + ETH_HLEN), nSubframe_Length);
-       }
-       else {
+       } else {
                sub_skb = rtw_skb_clone(prframe->u.hdr.pkt);
                if (sub_skb) {
                        sub_skb->data = pdata + ETH_HLEN;
                        sub_skb->len = nSubframe_Length;
                        skb_set_tail_pointer(sub_skb, nSubframe_Length);
-               }
-               else {
+               } else {
                        DBG_871X("%s(): rtw_skb_clone() Fail!!!\n", __func__);
                        return NULL;
                }
@@ -142,8 +140,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, 
_pkt *pkt, struct rx_pkt
                                                return;
                                        }
                                }
-                       }
-                       else {
+                       } else {
                                /*  to APself */
 
                                /* DBG_871X("to APSelf\n"); */
@@ -183,24 +180,21 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 
bgroup)
 
        if (psecuritypriv->last_mic_err_time == 0) {
                psecuritypriv->last_mic_err_time = jiffies;
-       }
-       else {
+       } else {
                cur_time = jiffies;
 
                if (cur_time - psecuritypriv->last_mic_err_time < 60*HZ) {
                        psecuritypriv->btkip_countermeasure = true;
                        psecuritypriv->last_mic_err_time = 0;
                        psecuritypriv->btkip_countermeasure_time = cur_time;
-               }
-               else {
+               } else {
                        psecuritypriv->last_mic_err_time = jiffies;
                }
        }
 
        if (bgroup) {
                key_type |= NL80211_KEYTYPE_GROUP;
-       }
-       else {
+       } else {
                key_type |= NL80211_KEYTYPE_PAIRWISE;
        }
 
@@ -210,8 +204,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 
bgroup)
        memset(&ev, 0x00, sizeof(ev));
        if (bgroup) {
            ev.flags |= IW_MICFAILURE_GROUP;
-       }
-       else {
+       } else {
            ev.flags |= IW_MICFAILURE_PAIRWISE;
        }
 
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c 
b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index c60f13c..9c408d9 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -88,8 +88,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)
        if (err) {
                dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++;
                printk(KERN_CRIT "%s: sdio_claim_irq FAIL(%d)!\n", __func__, 
err);
-       }
-       else {
+       } else {
                dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++;
                dvobj->irq_alloc = 1;
        }
@@ -115,8 +114,7 @@ static void sdio_free_irq(struct dvobj_priv *dvobj)
             if (err) {
                                dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;
                                DBG_871X_LEVEL(_drv_err_,"%s: sdio_release_irq 
FAIL(%d)!\n", __func__, err);
-            }
-            else
+            } else
                dvobj->drv_dbg.dbg_sdio_free_irq_cnt++;
             sdio_release_host(func);
         }
@@ -232,8 +230,7 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
                        if (err) {
                                dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++;
                                DBG_8192C(KERN_ERR "%s: 
sdio_release_irq(%d)\n", __func__, err);
-                       }
-                       else
+                       } else
                                dvobj->drv_dbg.dbg_sdio_free_irq_cnt++;
                }
 
-- 
2.7.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel