aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath9k/eeprom.c8
-rw-r--r--drivers/net/wireless/ath9k/eeprom.h2
-rw-r--r--drivers/net/wireless/ath9k/hw.c6
3 files changed, 4 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath9k/eeprom.c b/drivers/net/wireless/ath9k/eeprom.c
index c3bb1968bb5e..973b576c0ad8 100644
--- a/drivers/net/wireless/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath9k/eeprom.c
@@ -1232,7 +1232,7 @@ static void ath9k_hw_4k_set_gain(struct ath_hw *ah,
1232 REG_WRITE(ah, AR9285_AN_TOP4, (AR9285_AN_TOP4_DEFAULT | 0x14)); 1232 REG_WRITE(ah, AR9285_AN_TOP4, (AR9285_AN_TOP4_DEFAULT | 0x14));
1233} 1233}
1234 1234
1235static bool ath9k_hw_4k_set_board_values(struct ath_hw *ah, 1235static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
1236 struct ath9k_channel *chan) 1236 struct ath9k_channel *chan)
1237{ 1237{
1238 struct modal_eep_4k_header *pModal; 1238 struct modal_eep_4k_header *pModal;
@@ -1378,8 +1378,6 @@ static bool ath9k_hw_4k_set_board_values(struct ath_hw *ah,
1378 AR_PHY_SETTLING_SWITCH, 1378 AR_PHY_SETTLING_SWITCH,
1379 pModal->swSettleHt40); 1379 pModal->swSettleHt40);
1380 } 1380 }
1381
1382 return true;
1383} 1381}
1384 1382
1385static u16 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah, 1383static u16 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah,
@@ -1718,7 +1716,7 @@ static void ath9k_hw_def_set_gain(struct ath_hw *ah,
1718 } 1716 }
1719} 1717}
1720 1718
1721static bool ath9k_hw_def_set_board_values(struct ath_hw *ah, 1719static void ath9k_hw_def_set_board_values(struct ath_hw *ah,
1722 struct ath9k_channel *chan) 1720 struct ath9k_channel *chan)
1723{ 1721{
1724 struct modal_eep_header *pModal; 1722 struct modal_eep_header *pModal;
@@ -1884,8 +1882,6 @@ static bool ath9k_hw_def_set_board_values(struct ath_hw *ah,
1884 AR_PHY_TX_DESIRED_SCALE_CCK, 1882 AR_PHY_TX_DESIRED_SCALE_CCK,
1885 eep->baseEepHeader.desiredScaleCCK); 1883 eep->baseEepHeader.desiredScaleCCK);
1886 } 1884 }
1887
1888 return true;
1889} 1885}
1890 1886
1891static void ath9k_hw_def_set_addac(struct ath_hw *ah, 1887static void ath9k_hw_def_set_addac(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath9k/eeprom.h b/drivers/net/wireless/ath9k/eeprom.h
index 0a4b22a554d2..8e5b880d445d 100644
--- a/drivers/net/wireless/ath9k/eeprom.h
+++ b/drivers/net/wireless/ath9k/eeprom.h
@@ -490,7 +490,7 @@ struct eeprom_ops {
490 u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band); 490 u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band);
491 u16 (*get_eeprom_antenna_cfg)(struct ath_hw *hw, 491 u16 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,
492 struct ath9k_channel *chan); 492 struct ath9k_channel *chan);
493 bool (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan); 493 void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan);
494 void (*set_addac)(struct ath_hw *hw, struct ath9k_channel *chan); 494 void (*set_addac)(struct ath_hw *hw, struct ath9k_channel *chan);
495 int (*set_txpower)(struct ath_hw *hw, struct ath9k_channel *chan, 495 int (*set_txpower)(struct ath_hw *hw, struct ath9k_channel *chan,
496 u16 cfgCtl, u8 twiceAntennaReduction, 496 u16 cfgCtl, u8 twiceAntennaReduction,
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 3dd054b21f5a..78e5763f7c1a 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -2277,11 +2277,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
2277 else 2277 else
2278 ath9k_hw_spur_mitigate(ah, chan); 2278 ath9k_hw_spur_mitigate(ah, chan);
2279 2279
2280 if (!ah->eep_ops->set_board_values(ah, chan)) { 2280 ah->eep_ops->set_board_values(ah, chan);
2281 DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
2282 "error setting board options\n");
2283 return -EIO;
2284 }
2285 2281
2286 ath9k_hw_decrease_chain_power(ah, chan); 2282 ath9k_hw_decrease_chain_power(ah, chan);
2287 2283