Merge tag 'libnvdimm-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[deliverable/linux.git] / drivers / net / wireless / realtek / rtlwifi / rtl8723be / phy.c

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
index b7b73cbe346da9484601a23bfde76e026fdeceac..445f681d08c03aa36748f97d3e3c5b170d820614 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c
@@ -1723,8 +1723,8 @@ static u8 _rtl8723be_phy_path_a_rx_iqk(struct ieee80211_hw *hw)
 
        /* Allen 20131125 */
        tmp = (reg_eac & 0x03FF0000) >> 16;
-               if ((tmp & 0x200) > 0)
-                       tmp = 0x400 - tmp;
+       if ((tmp & 0x200) > 0)
+               tmp = 0x400 - tmp;
        /* if Tx is OK, check whether Rx is OK */
        if (!(reg_eac & BIT(27)) &&
            (((reg_ea4 & 0x03FF0000) >> 16) != 0x132) &&
@@ -2301,8 +2301,7 @@ static void _rtl8723be_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t)
        } else {
                rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);
        }
-RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
-
+       RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "\n");
 }
 
 static void _rtl8723be_phy_set_rfpath_switch(struct ieee80211_hw *hw,
@@ -2606,8 +2605,7 @@ static bool _rtl8723be_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                         "IPS Set eRf nic enable\n");
                                rtstatus = rtl_ps_enable_nic(hw);
                        } while (!rtstatus && (initializecount < 10));
-                               RT_CLEAR_PS_LEVEL(ppsc,
-                                                 RT_RF_OFF_LEVL_HALT_NIC);
+                       RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
                } else {
                        RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                 "Set ERFON sleeped:%d ms\n",