Commit f34639d3 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Remove a few unused capability macros 



Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 171387ef

drivers/net/wireless/ath9k/hw.c

+0 −26
Original line number Diff line number Diff line
@@ -3357,8 +3357,6 @@ bool ath9k_hw_fill_cap_info(struct ath_hw *ah) 
bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type,

			    u32 capability, u32 *result)

{

	const struct ath9k_hw_capabilities *pCap = &ah->caps;



	switch (type) {

	case ATH9K_CAP_CIPHER:

		switch (capability) {
@@ -3384,16 +3382,10 @@ bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type, 
	case ATH9K_CAP_TKIP_SPLIT:

		return (ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA) ?

			false : true;

	case ATH9K_CAP_WME_TKIPMIC:

		return 0;

	case ATH9K_CAP_PHYCOUNTERS:

		return ah->has_hw_phycounters ? 0 : -ENXIO;

	case ATH9K_CAP_DIVERSITY:

		return (REG_READ(ah, AR_PHY_CCK_DETECT) &

			AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV) ?

			true : false;

	case ATH9K_CAP_PHYDIAG:

		return true;

	case ATH9K_CAP_MCAST_KEYSRCH:

		switch (capability) {

		case 0:
@@ -3408,18 +3400,6 @@ bool ath9k_hw_getcapability(struct ath_hw *ah, enum ath9k_capability_type type, 
			}

		}

		return false;

	case ATH9K_CAP_TSF_ADJUST:

		return (ah->misc_mode & AR_PCU_TX_ADD_TSF) ?

			true : false;

	case ATH9K_CAP_RFSILENT:

		if (capability == 3)

			return false;

	case ATH9K_CAP_ANT_CFG_2GHZ:

		*result = pCap->num_antcfg_2ghz;

		return true;

	case ATH9K_CAP_ANT_CFG_5GHZ:

		*result = pCap->num_antcfg_5ghz;

		return true;

	case ATH9K_CAP_TXPOW:

		switch (capability) {

		case 0:
@@ -3472,12 +3452,6 @@ bool ath9k_hw_setcapability(struct ath_hw *ah, enum ath9k_capability_type type, 
		else

			ah->sta_id1_defaults &= ~AR_STA_ID1_MCAST_KSRCH;

		return true;

	case ATH9K_CAP_TSF_ADJUST:

		if (setting)

			ah->misc_mode |= AR_PCU_TX_ADD_TSF;

		else

			ah->misc_mode &= ~AR_PCU_TX_ADD_TSF;

		return true;

	default:

		return false;

	}

drivers/net/wireless/ath9k/hw.h

+0 −7
Original line number Diff line number Diff line
@@ -153,16 +153,9 @@ enum ath9k_capability_type { 
	ATH9K_CAP_CIPHER = 0,

	ATH9K_CAP_TKIP_MIC,

	ATH9K_CAP_TKIP_SPLIT,

	ATH9K_CAP_PHYCOUNTERS,

	ATH9K_CAP_DIVERSITY,

	ATH9K_CAP_TXPOW,

	ATH9K_CAP_PHYDIAG,

	ATH9K_CAP_MCAST_KEYSRCH,

	ATH9K_CAP_TSF_ADJUST,

	ATH9K_CAP_WME_TKIPMIC,

	ATH9K_CAP_RFSILENT,

	ATH9K_CAP_ANT_CFG_2GHZ,

	ATH9K_CAP_ANT_CFG_5GHZ,

	ATH9K_CAP_DS

};