diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/efuse.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/efuse.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c index 50de6f5d8a56..3fc21f60bb04 100644 --- 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) | |||
382 | } | 382 | } |
383 | } | 383 | } |
384 | 384 | ||
385 | if (wordchanged == true) | 385 | if (wordchanged) |
386 | hdr_num++; | 386 | hdr_num++; |
387 | } | 387 | } |
388 | 388 | ||
@@ -453,7 +453,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw) | |||
453 | base = offset * 8; | 453 | base = offset * 8; |
454 | 454 | ||
455 | for (i = 0; i < 8; i++) { | 455 | for (i = 0; i < 8; i++) { |
456 | if (first_pg == true) { | 456 | if (first_pg) { |
457 | 457 | ||
458 | word_en &= ~(BIT(i / 2)); | 458 | word_en &= ~(BIT(i / 2)); |
459 | 459 | ||
@@ -505,7 +505,7 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw) | |||
505 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 505 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
506 | struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); | 506 | struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); |
507 | 507 | ||
508 | if (rtlefuse->autoload_failflag == true) | 508 | if (rtlefuse->autoload_failflag) |
509 | memset(&rtlefuse->efuse_map[EFUSE_INIT_MAP][0], 0xFF, | 509 | memset(&rtlefuse->efuse_map[EFUSE_INIT_MAP][0], 0xFF, |
510 | rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]); | 510 | rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]); |
511 | else | 511 | else |
@@ -690,7 +690,7 @@ static void efuse_read_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr, | |||
690 | } | 690 | } |
691 | } | 691 | } |
692 | 692 | ||
693 | if (dataempty == true) { | 693 | if (dataempty) { |
694 | *readstate = PG_STATE_DATA; | 694 | *readstate = PG_STATE_DATA; |
695 | } else { | 695 | } else { |
696 | *efuse_addr = *efuse_addr + (word_cnts * 2) + 1; | 696 | *efuse_addr = *efuse_addr + (word_cnts * 2) + 1; |
@@ -925,7 +925,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, | |||
925 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 925 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
926 | struct pgpkt_struct target_pkt; | 926 | struct pgpkt_struct target_pkt; |
927 | u8 write_state = PG_STATE_HEADER; | 927 | u8 write_state = PG_STATE_HEADER; |
928 | int continual = true, dataempty = true, result = true; | 928 | int continual = true, result = true; |
929 | u16 efuse_addr = 0; | 929 | u16 efuse_addr = 0; |
930 | u8 efuse_data; | 930 | u8 efuse_data; |
931 | u8 target_word_cnts = 0; | 931 | u8 target_word_cnts = 0; |
@@ -953,7 +953,6 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, | |||
953 | (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) { | 953 | (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) { |
954 | 954 | ||
955 | if (write_state == PG_STATE_HEADER) { | 955 | if (write_state == PG_STATE_HEADER) { |
956 | dataempty = true; | ||
957 | badworden = 0x0F; | 956 | badworden = 0x0F; |
958 | RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, | 957 | RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, |
959 | ("efuse PG_STATE_HEADER\n")); | 958 | ("efuse PG_STATE_HEADER\n")); |
@@ -1176,13 +1175,12 @@ static u16 efuse_get_current_size(struct ieee80211_hw *hw) | |||
1176 | { | 1175 | { |
1177 | int continual = true; | 1176 | int continual = true; |
1178 | u16 efuse_addr = 0; | 1177 | u16 efuse_addr = 0; |
1179 | u8 hoffset, hworden; | 1178 | u8 hworden; |
1180 | u8 efuse_data, word_cnts; | 1179 | u8 efuse_data, word_cnts; |
1181 | 1180 | ||
1182 | while (continual && efuse_one_byte_read(hw, efuse_addr, &efuse_data) | 1181 | while (continual && efuse_one_byte_read(hw, efuse_addr, &efuse_data) |
1183 | && (efuse_addr < EFUSE_MAX_SIZE)) { | 1182 | && (efuse_addr < EFUSE_MAX_SIZE)) { |
1184 | if (efuse_data != 0xFF) { | 1183 | if (efuse_data != 0xFF) { |
1185 | hoffset = (efuse_data >> 4) & 0x0F; | ||
1186 | hworden = efuse_data & 0x0F; | 1184 | hworden = efuse_data & 0x0F; |
1187 | word_cnts = efuse_calculate_word_cnts(hworden); | 1185 | word_cnts = efuse_calculate_word_cnts(hworden); |
1188 | efuse_addr = efuse_addr + (word_cnts * 2) + 1; | 1186 | efuse_addr = efuse_addr + (word_cnts * 2) + 1; |