From 50954f4cb46c2dc18cda0bab5feaf2b984b645bd Mon Sep 17 00:00:00 2001
From: Sujith <Sujith.Manoharan@atheros.com>
Date: Fri, 13 Mar 2009 08:56:05 +0530
Subject: [PATCH] --- yaml --- r: 136119 b: refs/heads/master c:
 d6509151bd3e952b7d157ea4dbae23279d427e95 h: refs/heads/master i:   136117:
 136da4297231759c5d5bc98a765cd044dcb9e585   136115:
 1abe0ba8ab350634562b023e04e9a4566357c8fe   136111:
 e9aa24cfadec8a921f1ca107c9f70c2b5c2599e8 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/ath9k/eeprom.c | 8 ++------
 trunk/drivers/net/wireless/ath9k/eeprom.h | 2 +-
 trunk/drivers/net/wireless/ath9k/hw.c     | 6 +-----
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 8a277150cf5a..49c52c30eed7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a83615d74d9b952f24c904baad58610ed9d76838
+refs/heads/master: d6509151bd3e952b7d157ea4dbae23279d427e95
diff --git a/trunk/drivers/net/wireless/ath9k/eeprom.c b/trunk/drivers/net/wireless/ath9k/eeprom.c
index c3bb1968bb5e..973b576c0ad8 100644
--- a/trunk/drivers/net/wireless/ath9k/eeprom.c
+++ b/trunk/drivers/net/wireless/ath9k/eeprom.c
@@ -1232,7 +1232,7 @@ static void ath9k_hw_4k_set_gain(struct ath_hw *ah,
 		REG_WRITE(ah, AR9285_AN_TOP4, (AR9285_AN_TOP4_DEFAULT | 0x14));
 }
 
-static bool ath9k_hw_4k_set_board_values(struct ath_hw *ah,
+static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,
 					 struct ath9k_channel *chan)
 {
 	struct modal_eep_4k_header *pModal;
@@ -1378,8 +1378,6 @@ static bool ath9k_hw_4k_set_board_values(struct ath_hw *ah,
 				      AR_PHY_SETTLING_SWITCH,
 				      pModal->swSettleHt40);
 	}
-
-	return true;
 }
 
 static 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,
 	}
 }
 
-static bool ath9k_hw_def_set_board_values(struct ath_hw *ah,
+static void ath9k_hw_def_set_board_values(struct ath_hw *ah,
 					  struct ath9k_channel *chan)
 {
 	struct modal_eep_header *pModal;
@@ -1884,8 +1882,6 @@ static bool ath9k_hw_def_set_board_values(struct ath_hw *ah,
 			      AR_PHY_TX_DESIRED_SCALE_CCK,
 			      eep->baseEepHeader.desiredScaleCCK);
 	}
-
-	return true;
 }
 
 static void ath9k_hw_def_set_addac(struct ath_hw *ah,
diff --git a/trunk/drivers/net/wireless/ath9k/eeprom.h b/trunk/drivers/net/wireless/ath9k/eeprom.h
index 0a4b22a554d2..8e5b880d445d 100644
--- a/trunk/drivers/net/wireless/ath9k/eeprom.h
+++ b/trunk/drivers/net/wireless/ath9k/eeprom.h
@@ -490,7 +490,7 @@ struct eeprom_ops {
 	u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band);
 	u16 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,
 				      struct ath9k_channel *chan);
-	bool (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan);
+	void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan);
 	void (*set_addac)(struct ath_hw *hw, struct ath9k_channel *chan);
 	int (*set_txpower)(struct ath_hw *hw, struct ath9k_channel *chan,
 			   u16 cfgCtl, u8 twiceAntennaReduction,
diff --git a/trunk/drivers/net/wireless/ath9k/hw.c b/trunk/drivers/net/wireless/ath9k/hw.c
index 3dd054b21f5a..78e5763f7c1a 100644
--- a/trunk/drivers/net/wireless/ath9k/hw.c
+++ b/trunk/drivers/net/wireless/ath9k/hw.c
@@ -2277,11 +2277,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 	else
 		ath9k_hw_spur_mitigate(ah, chan);
 
-	if (!ah->eep_ops->set_board_values(ah, chan)) {
-		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
-			"error setting board options\n");
-		return -EIO;
-	}
+	ah->eep_ops->set_board_values(ah, chan);
 
 	ath9k_hw_decrease_chain_power(ah, chan);