Commit a36cfbca authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: rename ath_btcoex_supported() to ath9k_hw_btcoex_supported() 



Also just pass the ath_hw as the parameter.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8b4fc5ba

drivers/net/wireless/ath/ath9k/btcoex.c

+3 −3
Original line number Diff line number Diff line
@@ -45,15 +45,15 @@ static const u16 ath_subsysid_tbl[] = { 
 * Checks the subsystem id of the device to see if it

 * supports btcoex

 */

bool ath_btcoex_supported(u16 subsysid)

bool ath9k_hw_btcoex_supported(struct ath_hw *ah)

{

	int i;



	if (!subsysid)

	if (!ah->hw_version.subsysid)

		return false;



	for (i = 0; i < ARRAY_SIZE(ath_subsysid_tbl); i++)

		if (subsysid == ath_subsysid_tbl[i])

		if (ah->hw_version.subsysid == ath_subsysid_tbl[i])

			return true;



	return false;

drivers/net/wireless/ath/ath9k/btcoex.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct ath_btcoex_hw { 
	u32 bt_coex_mode2; 	/* Register setting for AR_BT_COEX_MODE2 */

};



bool ath_btcoex_supported(u16 subsysid);

bool ath9k_hw_btcoex_supported(struct ath_hw *ah);

void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah);

void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah);

void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum);

drivers/net/wireless/ath/ath9k/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -3728,7 +3728,7 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah) 
		ah->eep_ops->get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ);



	if (AR_SREV_9280_10_OR_LATER(ah) &&

	    ath_btcoex_supported(ah->hw_version.subsysid)) {

	    ath9k_hw_btcoex_supported(ah)) {

		btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO;

		btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO;