Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6-microblaze.git] / drivers / net / wireless / rtlwifi / rtl8192de / phy.c

diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 96dc717..34591ee 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -758,7 +758,7 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw)
        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "==>\n");
        rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw,
                BASEBAND_CONFIG_PHY_REG);
-       if (rtstatus != true) {
+       if (!rtstatus) {
                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Write BB Reg Fail!!\n");
                return false;
        }
@@ -773,13 +773,13 @@ static bool _rtl92d_phy_bb_config(struct ieee80211_hw *hw)
                rtstatus = _rtl92d_phy_config_bb_with_pgheaderfile(hw,
                        BASEBAND_CONFIG_PHY_REG);
        }
-       if (rtstatus != true) {
+       if (!rtstatus) {
                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "BB_PG Reg Fail!!\n");
                return false;
        }
        rtstatus = _rtl92d_phy_config_bb_with_headerfile(hw,
                BASEBAND_CONFIG_AGC_TAB);
-       if (rtstatus != true) {
+       if (!rtstatus) {
                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "AGC Table Fail\n");
                return false;
        }
@@ -1028,7 +1028,7 @@ void rtl92d_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        u8 cckpowerlevel[2], ofdmpowerlevel[2];
 
-       if (rtlefuse->txpwr_fromeprom == false)
+       if (!rtlefuse->txpwr_fromeprom)
                return;
        channel = _rtl92c_phy_get_rightchnlplace(channel);
        _rtl92d_get_txpower_index(hw, channel, &cckpowerlevel[0],
@@ -3219,8 +3219,7 @@ bool rtl92d_phy_set_rf_power_state(struct ieee80211_hw *hw,
                                RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
                                         "IPS Set eRf nic enable\n");
                                rtstatus = rtl_ps_enable_nic(hw);
-                       } while ((rtstatus != true) &&
-                                (InitializeCount < 10));
+                       } while (!rtstatus && (InitializeCount < 10));
 
                        RT_CLEAR_PS_LEVEL(ppsc,
                                          RT_RF_OFF_LEVL_HALT_NIC);