Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / net / wireless / rtlwifi / efuse.c

diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 50de6f5..3fc21f6 100644 (file)
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -382,7 +382,7 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw)
                        }
                }
 
-               if (wordchanged == true)
+               if (wordchanged)
                        hdr_num++;
        }
 
@@ -453,7 +453,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
                base = offset * 8;
 
                for (i = 0; i < 8; i++) {
-                       if (first_pg == true) {
+                       if (first_pg) {
 
                                word_en &= ~(BIT(i / 2));
 
@@ -505,7 +505,7 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
 
-       if (rtlefuse->autoload_failflag == true)
+       if (rtlefuse->autoload_failflag)
                memset(&rtlefuse->efuse_map[EFUSE_INIT_MAP][0], 0xFF,
                        rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
        else
@@ -690,7 +690,7 @@ static void efuse_read_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
                        }
                }
 
-               if (dataempty == true) {
+               if (dataempty) {
                        *readstate = PG_STATE_DATA;
                } else {
                        *efuse_addr = *efuse_addr + (word_cnts * 2) + 1;
@@ -925,7 +925,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct pgpkt_struct target_pkt;
        u8 write_state = PG_STATE_HEADER;
-       int continual = true, dataempty = true, result = true;
+       int continual = true, result = true;
        u16 efuse_addr = 0;
        u8 efuse_data;
        u8 target_word_cnts = 0;
@@ -953,7 +953,6 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
               (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) {
 
                if (write_state == PG_STATE_HEADER) {
-                       dataempty = true;
                        badworden = 0x0F;
                        RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
                                ("efuse PG_STATE_HEADER\n"));
@@ -1176,13 +1175,12 @@ static u16 efuse_get_current_size(struct ieee80211_hw *hw)
 {
        int continual = true;
        u16 efuse_addr = 0;
-       u8 hoffset, hworden;
+       u8 hworden;
        u8 efuse_data, word_cnts;
 
        while (continual && efuse_one_byte_read(hw, efuse_addr, &efuse_data)
               && (efuse_addr < EFUSE_MAX_SIZE)) {
                if (efuse_data != 0xFF) {
-                       hoffset = (efuse_data >> 4) & 0x0F;
                        hworden = efuse_data & 0x0F;
                        word_cnts = efuse_calculate_word_cnts(hworden);
                        efuse_addr = efuse_addr + (word_cnts * 2) + 1;