staging: rtl8712: Fix unbalanced braces around else statement

Fix checkpath-reported unbalanced braces in the following areas

221: FILE: drivers/staging/rtl8712/hal_init.c:221:
392: FILE: drivers/staging/rtl8712/os_intfs.c:392:
363: FILE: drivers/staging/rtl8712/rtl8712_cmd.c:363:
889: FILE: drivers/staging/rtl8712/rtl8712_recv.c:889:
902: FILE: drivers/staging/rtl8712/rtl871x_cmd.c:902:
84: FILE: drivers/staging/rtl8712/rtl871x_ioctl_set.c:84:
580: FILE: drivers/staging/rtl8712/rtl871x_mlme.c:580:
593: FILE: drivers/staging/rtl8712/usb_intf.c:593:

Signed-off-by: Liam Ryan <liamryandev@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index c83d7ebb164fe8bab6dadac3df7d7e2170ef04f3..de832b0b5eecf350b648be32302b629f6e3f3a1d 100644 (file)
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -216,9 +216,9 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
                emem_sz = fwhdr.img_SRAM_size;
                do {
                        memset(ptx_desc, 0, TXDESC_SIZE);
-                       if (emem_sz >  MAX_DUMP_FWSZ) /* max=48k */
+                       if (emem_sz >  MAX_DUMP_FWSZ) { /* max=48k */
                                dump_emem_sz = MAX_DUMP_FWSZ;
-                       else {
+                       } else {
                                dump_emem_sz = emem_sz;
                                ptx_desc->txdw0 |= cpu_to_le32(BIT(28));
                        }

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index e698f6ede44934ed4a49c37565ffa0e09aea5edb..990a3438dfbb2288cb383cc3cbdf1116bf8ccee2 100644 (file)
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -385,11 +385,11 @@ static int netdev_open(struct net_device *pnetdev)
                padapter->bup = true;
                if (rtl871x_hal_init(padapter) != _SUCCESS)
                        goto netdev_open_error;
-               if (!r8712_initmac)
+               if (!r8712_initmac) {
                        /* Use the mac address stored in the Efuse */
                        memcpy(pnetdev->dev_addr,
                               padapter->eeprompriv.mac_addr, ETH_ALEN);
-               else {
+               } else {
                        /* We have to inform f/w to use user-supplied MAC
                         * address.
                         */

diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
index 0104aced113e4e284900b291663ac2e8137ca4ce..3c88994fdfcd92f09fc2e84bc7dcf44f9da290cd 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -356,11 +356,11 @@ _next:
                                if ((wr_sz % 64) == 0)
                                        blnPending = 1;
                        }
-                       if (blnPending) /* 32 bytes for TX Desc - 8 offset */
+                       if (blnPending) { /* 32 bytes for TX Desc - 8 offset */
                                pdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE +
                                                OFFSET_SZ + 8) << OFFSET_SHT) &
                                                0x00ff0000);
-                       else {
+                       } else {
                                pdesc->txdw0 |= cpu_to_le32(((TXDESC_SIZE +
                                                              OFFSET_SZ) <<
                                                              OFFSET_SHT) &

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index ea3eb94b28b314d23c944b5347fc8eee8e216405..097872739f36a922b58bde8691db5a33a8867f61 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -883,10 +883,10 @@ static void query_rx_phy_status(struct _adapter *padapter,
         * from 0~100. It is assigned to the BSS List in
         * GetValueFromBeaconOrProbeRsp().
         */
-       if (bcck_rate)
+       if (bcck_rate) {
                prframe->u.hdr.attrib.signal_strength =
                         (u8)r8712_signal_scale_mapping(pwdb_all);
-       else {
+       } else {
                if (rf_rx_num != 0)
                        prframe->u.hdr.attrib.signal_strength =
                                 (u8)(r8712_signal_scale_mapping(total_rssi /=

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 04638f1e4e881da9b6105977367b70ee2a3cef52..a424f447a72522fa48ddaddfd5bbb369fe16a2f5 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -899,9 +899,10 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
                        if (!pwlan)
                                goto createbss_cmd_fail;
                        pwlan->last_scanned = jiffies;
-               } else
+               } else {
                        list_add_tail(&(pwlan->list),
                                         &pmlmepriv->scanned_queue.queue);
+               }
                pnetwork->Length = r8712_get_wlan_bssid_ex_sz(pnetwork);
                memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
                pwlan->fixed = true;

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
index 01a150446f5a2df7e1ff9fb499db82d917cb99ee..8a5ced4fa9d3ab8bc44d1674334a749c791966e4 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c
@@ -78,10 +78,10 @@ static u8 do_join(struct _adapter *padapter)
                int ret;
 
                ret = r8712_select_and_join_from_scan(pmlmepriv);
-               if (ret == _SUCCESS)
+               if (ret == _SUCCESS) {
                        mod_timer(&pmlmepriv->assoc_timer,
                                  jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));
-               else {
+               } else {
                        if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
                                /* submit r8712_createbss_cmd to change to an
                                 * ADHOC_MASTER pmlmepriv->lock has been

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index bf1ac22bae1c48ebfb4484a69b6bd62cddc0c599..111c809afc51ab2ccfd25f89910315147a27ddc2 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -574,10 +574,10 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
                                set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
 
                                if (r8712_select_and_join_from_scan(pmlmepriv)
-                                   == _SUCCESS)
+                                   == _SUCCESS) {
                                        mod_timer(&pmlmepriv->assoc_timer, jiffies +
                                                  msecs_to_jiffies(MAX_JOIN_TIMEOUT));
-                               else {
+                               } else {
                                        struct wlan_bssid_ex *pdev_network =
                                          &(adapter->registrypriv.dev_network);
                                        u8 *pibss =

diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index b3e266bd57ab1615a64923cf94cd432f746b271e..85eadddfaf06092e1525c762c9c0334418844d01 100644 (file)
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -590,9 +590,10 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
                        mac[0] &= 0xFE;
                        dev_info(&udev->dev,
                                "r8712u: MAC Address from user = %pM\n", mac);
-               } else
+               } else {
                        dev_info(&udev->dev,
                                "r8712u: MAC Address from efuse = %pM\n", mac);
+               }
                ether_addr_copy(pnetdev->dev_addr, mac);
        }
        /* step 6. Load the firmware asynchronously */