aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-09-09 19:05:32 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-07 16:39:23 -0400
commita36cfbca21d0acbab0840337f0b59ea58f415e50 (patch)
tree7e084520083cec501577a3ffc9953cc5bbcb51d9 /drivers
parent8b4fc5ba896cd1b73c598d07fc51224abbfe8cdb (diff)
ath9k: rename ath_btcoex_supported() to ath9k_hw_btcoex_supported()
Also just pass the ath_hw as the parameter. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/btcoex.c6
-rw-r--r--drivers/net/wireless/ath/ath9k/btcoex.h2
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index ee2a83491235..5d1095f18d77 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -45,15 +45,15 @@ static const u16 ath_subsysid_tbl[] = {
45 * Checks the subsystem id of the device to see if it 45 * Checks the subsystem id of the device to see if it
46 * supports btcoex 46 * supports btcoex
47 */ 47 */
48bool ath_btcoex_supported(u16 subsysid) 48bool ath9k_hw_btcoex_supported(struct ath_hw *ah)
49{ 49{
50 int i; 50 int i;
51 51
52 if (!subsysid) 52 if (!ah->hw_version.subsysid)
53 return false; 53 return false;
54 54
55 for (i = 0; i < ARRAY_SIZE(ath_subsysid_tbl); i++) 55 for (i = 0; i < ARRAY_SIZE(ath_subsysid_tbl); i++)
56 if (subsysid == ath_subsysid_tbl[i]) 56 if (ah->hw_version.subsysid == ath_subsysid_tbl[i])
57 return true; 57 return true;
58 58
59 return false; 59 return false;
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index 0dc51202d451..1ba31a73317c 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -47,7 +47,7 @@ struct ath_btcoex_hw {
47 u32 bt_coex_mode2; /* Register setting for AR_BT_COEX_MODE2 */ 47 u32 bt_coex_mode2; /* Register setting for AR_BT_COEX_MODE2 */
48}; 48};
49 49
50bool ath_btcoex_supported(u16 subsysid); 50bool ath9k_hw_btcoex_supported(struct ath_hw *ah);
51void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah); 51void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah);
52void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah); 52void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah);
53void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum); 53void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum);
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 93b3258190cb..de83d3c4b469 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -3728,7 +3728,7 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah)
3728 ah->eep_ops->get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ); 3728 ah->eep_ops->get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ);
3729 3729
3730 if (AR_SREV_9280_10_OR_LATER(ah) && 3730 if (AR_SREV_9280_10_OR_LATER(ah) &&
3731 ath_btcoex_supported(ah->hw_version.subsysid)) { 3731 ath9k_hw_btcoex_supported(ah)) {
3732 btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO; 3732 btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO;
3733 btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO; 3733 btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
3734 3734