From 5142889a410e85660d405eabc0fd3f5efee403cc Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Thu, 15 Apr 2010 17:38:13 -0400
Subject: [PATCH] --- yaml --- r: 194363 b: refs/heads/master c:
 aed1baf1ab10f4b6bd40952a9deb791dbba48f3a h: refs/heads/master i:   194361:
 360a4f57c5f2165a0fd4a41299272f0b806e1d51   194359:
 4860d68e5dcbffe8b6297f2fd0a4e9d87119228e v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/net/wireless/ath/ath9k/hw.c  |  2 +-
 trunk/drivers/net/wireless/ath/ath9k/phy.c | 15 ---------------
 trunk/drivers/net/wireless/ath/ath9k/phy.h |  3 ---
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 2d6f0c24b830..b3570e9e5849 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42d5bc3faabcc9d7ea1cfe9237d71ef7dce386e3
+refs/heads/master: aed1baf1ab10f4b6bd40952a9deb791dbba48f3a
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
index 57c59b6ad5ea..6f447cdbd05c 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hw.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -1483,7 +1483,7 @@ static int ath9k_hw_process_ini(struct ath_hw *ah,
 					modesIndex, regWrites);
 	}
 
-	ath9k_hw_write_regs(ah, freqIndex, regWrites);
+	REG_WRITE_ARRAY(&ah->iniBB_RfGain, freqIndex, regWrites);
 
 	if (AR_SREV_9280_20(ah) && IS_CHAN_A_5MHZ_SPACED(chan)) {
 		REG_WRITE_ARRAY(&ah->iniModesAdditional, modesIndex,
diff --git a/trunk/drivers/net/wireless/ath/ath9k/phy.c b/trunk/drivers/net/wireless/ath/ath9k/phy.c
index c3b59390fe38..02d40dfd3a91 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/phy.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/phy.c
@@ -41,21 +41,6 @@
 
 #include "hw.h"
 
-/**
- * ath9k_hw_write_regs - ??
- *
- * @ah: atheros hardware structure
- * @freqIndex:
- * @regWrites:
- *
- * Used for both the chipsets with an external AR2133/AR5133 radios and
- * single-chip devices.
- */
-void ath9k_hw_write_regs(struct ath_hw *ah, u32 freqIndex, int regWrites)
-{
-	REG_WRITE_ARRAY(&ah->iniBB_RfGain, freqIndex, regWrites);
-}
-
 /**
  * ath9k_hw_ar9280_set_channel - set channel on single-chip device
  * @ah: atheros hardware structure
diff --git a/trunk/drivers/net/wireless/ath/ath9k/phy.h b/trunk/drivers/net/wireless/ath/ath9k/phy.h
index 0132e4c9a9f9..4b6e494bd984 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/phy.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/phy.h
@@ -17,9 +17,6 @@
 #ifndef PHY_H
 #define PHY_H
 
-/* Common between single chip and non single-chip solutions */
-void ath9k_hw_write_regs(struct ath_hw *ah, u32 freqIndex, int regWrites);
-
 /* Single chip radio settings */
 int ath9k_hw_ar9280_set_channel(struct ath_hw *ah, struct ath9k_channel *chan);
 void ath9k_hw_9280_spur_mitigate(struct ath_hw *ah, struct ath9k_channel *chan);