diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-04-15 17:38:13 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-16 15:32:03 -0400 |
commit | aed1baf1ab10f4b6bd40952a9deb791dbba48f3a (patch) | |
tree | 06af74c5b0c21e5ff2e73bedc2f2313ecccccfc4 /drivers/net/wireless | |
parent | 42d5bc3faabcc9d7ea1cfe9237d71ef7dce386e3 (diff) |
ath9k_hw: remove wrapper ath9k_hw_write_regs()
This is used only once by ath9k_hw_process_ini() to
write an array of phy registers through REG_WRITE_ARRAY(),
but we already call REG_WRITE_ARRAY() multiple times
on the same caller so just remove this pointless wrapper.
We'll eventually just move the ath9k_hw_process_ini()
caller as an callback to abstract away between different
hardware families.
Although this change is subtle I should note that this
does change the delay pattern on writing the next series
of registers. REG_WRITE_ARRAY() uses a counter for each
register write and does a udelay(1) every 64 writes. By
removing this call it means that the counter is processed
for all the iniBB_RfGain registers and is incremented
on ath9k_hw_process_ini(), before this the after the call
ath9k_hw_write_regs() was made the register counter was
kept at the same index number prior to the call.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/phy.c | 15 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/phy.h | 3 |
3 files changed, 1 insertions, 19 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 57c59b6ad5ea..6f447cdbd05c 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1483,7 +1483,7 @@ static int ath9k_hw_process_ini(struct ath_hw *ah, | |||
1483 | modesIndex, regWrites); | 1483 | modesIndex, regWrites); |
1484 | } | 1484 | } |
1485 | 1485 | ||
1486 | ath9k_hw_write_regs(ah, freqIndex, regWrites); | 1486 | REG_WRITE_ARRAY(&ah->iniBB_RfGain, freqIndex, regWrites); |
1487 | 1487 | ||
1488 | if (AR_SREV_9280_20(ah) && IS_CHAN_A_5MHZ_SPACED(chan)) { | 1488 | if (AR_SREV_9280_20(ah) && IS_CHAN_A_5MHZ_SPACED(chan)) { |
1489 | REG_WRITE_ARRAY(&ah->iniModesAdditional, modesIndex, | 1489 | REG_WRITE_ARRAY(&ah->iniModesAdditional, modesIndex, |
diff --git a/drivers/net/wireless/ath/ath9k/phy.c b/drivers/net/wireless/ath/ath9k/phy.c index c3b59390fe38..02d40dfd3a91 100644 --- a/drivers/net/wireless/ath/ath9k/phy.c +++ b/drivers/net/wireless/ath/ath9k/phy.c | |||
@@ -42,21 +42,6 @@ | |||
42 | #include "hw.h" | 42 | #include "hw.h" |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * ath9k_hw_write_regs - ?? | ||
46 | * | ||
47 | * @ah: atheros hardware structure | ||
48 | * @freqIndex: | ||
49 | * @regWrites: | ||
50 | * | ||
51 | * Used for both the chipsets with an external AR2133/AR5133 radios and | ||
52 | * single-chip devices. | ||
53 | */ | ||
54 | void ath9k_hw_write_regs(struct ath_hw *ah, u32 freqIndex, int regWrites) | ||
55 | { | ||
56 | REG_WRITE_ARRAY(&ah->iniBB_RfGain, freqIndex, regWrites); | ||
57 | } | ||
58 | |||
59 | /** | ||
60 | * ath9k_hw_ar9280_set_channel - set channel on single-chip device | 45 | * ath9k_hw_ar9280_set_channel - set channel on single-chip device |
61 | * @ah: atheros hardware structure | 46 | * @ah: atheros hardware structure |
62 | * @chan: | 47 | * @chan: |
diff --git a/drivers/net/wireless/ath/ath9k/phy.h b/drivers/net/wireless/ath/ath9k/phy.h index 0132e4c9a9f9..4b6e494bd984 100644 --- a/drivers/net/wireless/ath/ath9k/phy.h +++ b/drivers/net/wireless/ath/ath9k/phy.h | |||
@@ -17,9 +17,6 @@ | |||
17 | #ifndef PHY_H | 17 | #ifndef PHY_H |
18 | #define PHY_H | 18 | #define PHY_H |
19 | 19 | ||
20 | /* Common between single chip and non single-chip solutions */ | ||
21 | void ath9k_hw_write_regs(struct ath_hw *ah, u32 freqIndex, int regWrites); | ||
22 | |||
23 | /* Single chip radio settings */ | 20 | /* Single chip radio settings */ |
24 | int ath9k_hw_ar9280_set_channel(struct ath_hw *ah, struct ath9k_channel *chan); | 21 | int ath9k_hw_ar9280_set_channel(struct ath_hw *ah, struct ath9k_channel *chan); |
25 | void ath9k_hw_9280_spur_mitigate(struct ath_hw *ah, struct ath9k_channel *chan); | 22 | void ath9k_hw_9280_spur_mitigate(struct ath_hw *ah, struct ath9k_channel *chan); |