staging: rtl8723bs: Move braces to same line as conditional

Ensure checkpatch compliance

Signed-off-by: Justin Vreeland <justin@jvreeland.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 28d1a229c3a644152496c6b4de4a79c52ef74b20..21ec890fd60c8a51a868857ef63a919bf87c5fe5 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -385,8 +385,7 @@ s32 PHY_MACConfig8723B(struct adapter *Adapter)
        /*  Config MAC */
        /*  */
        rtStatus = phy_ConfigMACWithParaFile(Adapter, pszMACRegFile);
-       if (rtStatus == _FAIL)
-       {
+       if (rtStatus == _FAIL) {
                ODM_ConfigMACWithHeaderFile(&pHalData->odmpriv);
                rtStatus = _SUCCESS;
        }
@@ -459,8 +458,7 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
                Adapter->registrypriv.RegEnableTxPowerLimit == 1 ||
                (Adapter->registrypriv.RegEnableTxPowerLimit == 2 && pHalData->EEPROMRegulatory == 1)
        ) {
-               if (PHY_ConfigRFWithPowerLimitTableParaFile(Adapter, pszRFTxPwrLmtFile) == _FAIL)
-               {
+               if (PHY_ConfigRFWithPowerLimitTableParaFile(Adapter, pszRFTxPwrLmtFile) == _FAIL) {
                        if (HAL_STATUS_SUCCESS != ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, CONFIG_RF_TXPWR_LMT, (ODM_RF_RADIO_PATH_E)0))
                                rtStatus = _FAIL;
                }
@@ -474,8 +472,8 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
        /*  */
        /*  1. Read PHY_REG.TXT BB INIT!! */
        /*  */
-       if (phy_ConfigBBWithParaFile(Adapter, pszBBRegFile, CONFIG_BB_PHY_REG) == _FAIL)
-       {
+       if (phy_ConfigBBWithParaFile(Adapter, pszBBRegFile, CONFIG_BB_PHY_REG) ==
+               _FAIL) {
                if (HAL_STATUS_SUCCESS != ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG))
                        rtStatus = _FAIL;
        }
@@ -491,8 +489,8 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
                Adapter->registrypriv.RegEnableTxPowerByRate == 1 ||
                (Adapter->registrypriv.RegEnableTxPowerByRate == 2 && pHalData->EEPROMRegulatory != 2)
        ) {
-               if (phy_ConfigBBWithPgParaFile(Adapter, pszBBRegPgFile) == _FAIL)
-               {
+               if (phy_ConfigBBWithPgParaFile(Adapter, pszBBRegPgFile) ==
+                       _FAIL) {
                        if (HAL_STATUS_SUCCESS != ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG_PG))
                                rtStatus = _FAIL;
                }
@@ -514,8 +512,8 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
        /*  */
        /*  2. Read BB AGC table Initialization */
        /*  */
-       if (phy_ConfigBBWithParaFile(Adapter, pszAGCTableFile, CONFIG_BB_AGC_TAB) == _FAIL)
-       {
+       if (phy_ConfigBBWithParaFile(Adapter, pszAGCTableFile,
+                                    CONFIG_BB_AGC_TAB) == _FAIL) {
                if (HAL_STATUS_SUCCESS != ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_AGC_TAB))
                        rtStatus = _FAIL;
        }

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
index 3a85d0cddfda8b8a8a1eaf3dafe2e163f25fc4c2..a71b552eca9abd130c1f517a944886a6d6c62a1c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
@@ -144,15 +144,15 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
                /*----Initialize RF fom connfiguration file----*/
                switch (eRFPath) {
                case RF_PATH_A:
-                       if (PHY_ConfigRFWithParaFile(Adapter, pszRadioAFile, eRFPath) == _FAIL)
-                       {
+                       if (PHY_ConfigRFWithParaFile(Adapter, pszRadioAFile,
+                                                    eRFPath) == _FAIL) {
                                if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, CONFIG_RF_RADIO, (ODM_RF_RADIO_PATH_E)eRFPath))
                                        rtStatus = _FAIL;
                        }
                        break;
                case RF_PATH_B:
-                       if (PHY_ConfigRFWithParaFile(Adapter, pszRadioBFile, eRFPath) == _FAIL)
-                       {
+                       if (PHY_ConfigRFWithParaFile(Adapter, pszRadioBFile,
+                                                    eRFPath) == _FAIL) {
                                if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, CONFIG_RF_RADIO, (ODM_RF_RADIO_PATH_E)eRFPath))
                                        rtStatus = _FAIL;
                        }
@@ -186,8 +186,8 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
        /* 3 Configuration of Tx Power Tracking */
        /* 3 ----------------------------------------------------------------- */
 
-       if (PHY_ConfigRFWithTxPwrTrackParaFile(Adapter, pszTxPwrTrackFile) == _FAIL)
-       {
+       if (PHY_ConfigRFWithTxPwrTrackParaFile(Adapter, pszTxPwrTrackFile) ==
+               _FAIL) {
                ODM_ConfigRFWithTxPwrTrackHeaderFile(&pHalData->odmpriv);
        }
 

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index ca6ad9659b09f569fd30bb28065fb658c1ebb702..505e122bdfb50bd7696617266d16c6f0f929da43 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -23,8 +23,7 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)
        u32 n = 0;
        struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
 
-       while (pHalData->SdioTxOQTFreeSpace < agg_num)
-       {
+       while (pHalData->SdioTxOQTFreeSpace < agg_num) {
                if (
                        (padapter->bSurpriseRemoved == true) ||
                        (padapter->bDriverStopped == true)
@@ -299,7 +298,8 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
                                ) {
                                        if (pxmitbuf) {
                                                /* pxmitbuf->priv_data will be NULL, and will crash here */
-                                               if (pxmitbuf->len > 0 && pxmitbuf->priv_data) {
+                                               if (pxmitbuf->len > 0 &&
+                                                   pxmitbuf->priv_data) {
                                                        struct xmit_frame *pframe;
                                                        pframe = (struct xmit_frame*)pxmitbuf->priv_data;
                                                        pframe->agg_num = k;
@@ -400,8 +400,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
                                pxmitbuf->priv_data = NULL;
                                enqueue_pending_xmitbuf(pxmitpriv, pxmitbuf);
                                yield();
-                       }
-                       else
+                       } else
                                rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
                        pxmitbuf = NULL;
                }