Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65c1a4de authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Remove unused ANI commands 



Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a16b635f

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

+0 −3
Original line number Diff line number Diff line
@@ -319,9 +319,6 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning) 
			ah->ani_function = 0;

	}



	/* always allow mode (on/off) to be controlled */

	ah->ani_function |= ATH9K_ANI_MODE;



	ofdm_nil = max_t(int, ATH9K_ANI_OFDM_DEF_LEVEL,

			 aniState->ofdmNoiseImmunityLevel);

	cck_nil = max_t(int, ATH9K_ANI_CCK_DEF_LEVEL,

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

+4 −9
Original line number Diff line number Diff line
@@ -48,15 +48,10 @@ 
/* values here are relative to the INI */



enum ath9k_ani_cmd {

	ATH9K_ANI_PRESENT = 0x1,

	ATH9K_ANI_NOISE_IMMUNITY_LEVEL = 0x2,

	ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION = 0x4,

	ATH9K_ANI_CCK_WEAK_SIGNAL_THR = 0x8,

	ATH9K_ANI_FIRSTEP_LEVEL = 0x10,

	ATH9K_ANI_SPUR_IMMUNITY_LEVEL = 0x20,

	ATH9K_ANI_MODE = 0x40,

	ATH9K_ANI_PHYERR_RESET = 0x80,

	ATH9K_ANI_MRC_CCK = 0x100,

	ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION = 0x1,

	ATH9K_ANI_FIRSTEP_LEVEL = 0x2,

	ATH9K_ANI_SPUR_IMMUNITY_LEVEL = 0x4,

	ATH9K_ANI_MRC_CCK = 0x8,

	ATH9K_ANI_ALL = 0xfff

};

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

+0 −2
Original line number Diff line number Diff line
@@ -1160,8 +1160,6 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah, 
		 */

		WARN_ON(1);

		break;

	case ATH9K_ANI_PRESENT:

		break;

	default:

		ath_dbg(common, ANI, "invalid cmd %u\n", cmd);

		return false;

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

+0 −2
Original line number Diff line number Diff line
@@ -1193,8 +1193,6 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah, 
		}

	break;

	}

	case ATH9K_ANI_PRESENT:

		break;

	default:

		ath_dbg(common, ANI, "invalid cmd %u\n", cmd);

		return false;

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

+0 −2
Original line number Diff line number Diff line
@@ -655,8 +655,6 @@ static int __ath9k_hw_init(struct ath_hw *ah) 
	ath9k_hw_init_cal_settings(ah);



	ah->ani_function = ATH9K_ANI_ALL;

	if (AR_SREV_9280_20_OR_LATER(ah) && !AR_SREV_9300_20_OR_LATER(ah))

		ah->ani_function &= ~ATH9K_ANI_NOISE_IMMUNITY_LEVEL;

	if (!AR_SREV_9300_20_OR_LATER(ah))

		ah->ani_function &= ~ATH9K_ANI_MRC_CCK;