staging: rtl8723bs: Remove unneccesary braces and change position of open brace

Follow linux-kernel code style for conditional statements

Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 4356cff..c69a144 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -351,8 +351,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
        struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
        struct sockaddr *addr = p;
 
-       if (padapter->bup == false)
-       {
+       if (padapter->bup == false) {
                /* DBG_871X("r8711_net_set_mac_address(), MAC =%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], */
                /* addr->sa_data[4], addr->sa_data[5]); */
                memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
@@ -425,9 +424,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
        skb->priority = rtw_classify8021d(skb);
 
        if (pmlmepriv->acm_mask != 0)
-       {
                skb->priority = qos_acm(pmlmepriv->acm_mask, skb->priority);
-       }
 
        return rtw_1d_to_queue[skb->priority];
 }
@@ -1037,8 +1034,7 @@ int netdev_open(struct net_device *pnetdev)
        struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
        struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
 
-       if (pwrctrlpriv->bInSuspend == true)
-       {
+       if (pwrctrlpriv->bInSuspend == true) {
                DBG_871X("+871x_drv - drv_open, bInSuspend =%d\n", pwrctrlpriv->bInSuspend);
                return 0;
        }
@@ -1067,16 +1063,13 @@ static int  ips_netdrv_open(struct adapter *padapter)
        /* padapter->bup = true; */
 
        status = rtw_hal_init(padapter);
-       if (status == _FAIL)
-       {
+       if (status == _FAIL) {
                RT_TRACE(_module_os_intfs_c_, _drv_err_, ("ips_netdrv_open(): Can't init h/w!\n"));
                goto netdev_open_error;
        }
 
        if (padapter->intf_start)
-       {
                padapter->intf_start(padapter);
-       }
 
        _set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000);
 
@@ -1120,9 +1113,7 @@ void rtw_ips_dev_unload(struct adapter *padapter)
 
 
        if (padapter->bSurpriseRemoved == false)
-       {
                rtw_hal_deinit(padapter);
-       }
 
 }
 
@@ -1133,8 +1124,7 @@ static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
 
        struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
 
-       if (true == bnormal)
-       {
+       if (true == bnormal) {
                if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->hw_init_mutex)) == 0) {
                        status = _netdev_open(pnetdev);
                        mutex_unlock(&(adapter_to_dvobj(padapter)->hw_init_mutex));
@@ -1153,8 +1143,7 @@ static int netdev_close(struct net_device *pnetdev)
 
        RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - drv_close\n"));
 
-       if (pwrctl->bInternalAutoSuspend == true)
-       {
+       if (pwrctl->bInternalAutoSuspend == true) {
                /* rtw_pwr_wakeup(padapter); */
                if (pwrctl->rf_pwrstate == rf_off)
                        pwrctl->ps_flag = true;
@@ -1175,8 +1164,7 @@ static int netdev_close(struct net_device *pnetdev)
                DBG_871X("(2)871x_drv - drv_close, bup =%d, hw_init_completed =%d\n", padapter->bup, padapter->hw_init_completed);
 
                /* s1. */
-               if (pnetdev)
-               {
+               if (pnetdev) {
                        if (!rtw_netif_queue_stopped(pnetdev))
                                rtw_netif_stop_queue(pnetdev);
                }
@@ -1220,8 +1208,7 @@ void rtw_dev_unload(struct adapter *padapter)
 
        RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("+%s\n", __func__));
 
-       if (padapter->bup == true)
-       {
+       if (padapter->bup == true) {
                DBG_871X("===> %s\n", __func__);
 
                padapter->bDriverStopped = true;
@@ -1258,8 +1245,7 @@ void rtw_dev_unload(struct adapter *padapter)
                        DBG_871X_LEVEL(_drv_always_, "%s: driver not in IPS\n", __func__);
                }
 
-               if (padapter->bSurpriseRemoved == false)
-               {
+               if (padapter->bSurpriseRemoved == false) {
                        rtw_btcoex_IpsNotify(padapter, pwrctl->ips_mode_req);
 #ifdef CONFIG_WOWLAN
                        if (pwrctl->bSupportRemoteWakeup == true &&
@@ -1297,8 +1283,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
 
        if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) {
                if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
-                       && check_fwstate(pmlmepriv, _FW_LINKED))
-               {
+                       && check_fwstate(pmlmepriv, _FW_LINKED)) {
                        DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__,
                                        pmlmepriv->cur_network.network.Ssid.Ssid,
                                        MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
@@ -1308,14 +1293,12 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
                }
        }
 
-       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED))
-       {
+       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)) {
                rtw_disassoc_cmd(padapter, 0, false);
                /* s2-2.  indicate disconnect to os */
                rtw_indicate_disconnect(padapter);
        }
-       else if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
-       {
+       else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
                rtw_sta_flush(padapter);
        }
 
@@ -1328,8 +1311,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
                rtw_indicate_scan_done(padapter, 1);
 
-       if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)
-       {
+       if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) {
                DBG_871X_LEVEL(_drv_always_, "%s: fw_under_linking\n", __func__);
                rtw_indicate_disconnect(padapter);
        }
@@ -1380,8 +1362,7 @@ int rtw_suspend_wow(struct adapter *padapter)
                padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
                if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) {
                        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
-                               && check_fwstate(pmlmepriv, _FW_LINKED))
-                       {
+                               && check_fwstate(pmlmepriv, _FW_LINKED)) {
                                DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__,
                                                pmlmepriv->cur_network.network.Ssid.Ssid,
                                                MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
@@ -1394,8 +1375,7 @@ int rtw_suspend_wow(struct adapter *padapter)
 
                DBG_871X_LEVEL(_drv_always_, "%s: wowmode suspending\n", __func__);
 
-               if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
-               {
+               if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
                        DBG_871X_LEVEL(_drv_always_, "%s: fw_under_survey\n", __func__);
                        rtw_indicate_scan_done(padapter, 1);
                        clr_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
@@ -1413,8 +1393,7 @@ int rtw_suspend_wow(struct adapter *padapter)
                        rtw_set_ps_mode(padapter, PS_MODE_DTIM, 0, 0, "WOWLAN");
 
        }
-       else
-       {
+       else {
                DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode);
        }
        DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
@@ -1490,8 +1469,7 @@ static int rtw_suspend_normal(struct adapter *padapter)
        rtw_suspend_free_assoc_resource(padapter);
 
        if ((rtw_hal_check_ips_status(padapter) == true)
-               || (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off))
-       {
+               || (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)) {
                DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR #### driver in IPS ####ERROR###!!!\n", __func__);
 
        }
@@ -1525,8 +1503,7 @@ int rtw_suspend_common(struct adapter *padapter)
        while (pwrpriv->bips_processing == true)
                msleep(1);
 
-       if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved))
-       {
+       if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved)) {
                DBG_871X("%s bup =%d bDriverStopped =%d bSurpriseRemoved = %d\n", __func__
                        , padapter->bup, padapter->bDriverStopped, padapter->bSurpriseRemoved);
                pdbgpriv->dbg_suspend_error_cnt++;
@@ -1815,16 +1792,14 @@ static int rtw_resume_process_normal(struct adapter *padapter)
        DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
        /*  interface init */
        /* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */
-       if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS))
-       {
+       if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS)) {
                ret = -1;
                RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s: initialize SDIO Failed!!\n", __func__));
                goto exit;
        }
        rtw_hal_disable_interrupt(padapter);
        /* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */
-       if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS))
-       {
+       if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS)) {
                ret = -1;
                RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s: sdio_alloc_irq Failed!!\n", __func__));
                goto exit;