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

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

ath9k: Unused macros, variables

parent d2d80ee9
Loading
Loading
Loading
Loading
+10 −8
Original line number Diff line number Diff line
@@ -790,19 +790,20 @@ struct ath_hal {
	u32 ah_magic;
	u16 ah_devid;
	u16 ah_subvendorid;
	struct ath_softc *ah_sc;
	void __iomem *ah_sh;
	u16 ah_countryCode;
	u32 ah_macVersion;
	u16 ah_macRev;
	u16 ah_phyRev;
	u16 ah_analog5GhzRev;
	u16 ah_analog2GhzRev;
	u8 ah_decompMask[ATH9K_DECOMP_MASK_SIZE];
	u32 ah_flags;

	void __iomem *ah_sh;
	struct ath_softc *ah_sc;
	enum ath9k_opmode ah_opmode;
	struct ath9k_ops_config ah_config;
	struct ath9k_hw_capabilities ah_caps;

	u16 ah_countryCode;
	u32 ah_flags;
	int16_t ah_powerLimit;
	u16 ah_maxPowerLevel;
	u32 ah_tpScale;
@@ -812,15 +813,16 @@ struct ath_hal {
	u16 ah_currentRD5G;
	u16 ah_currentRD2G;
	char ah_iso[4];
	enum start_adhoc_option ah_adHocMode;
	bool ah_commonMode;

	struct ath9k_channel ah_channels[150];
	u32 ah_nchan;
	struct ath9k_channel *ah_curchan;
	u32 ah_nchan;

	u16 ah_rfsilent;
	bool ah_rfkillEnabled;
	bool ah_isPciExpress;
	u16 ah_txTrigLevel;

#ifndef ATH_NF_PER_CHAN
	struct ath9k_nfcal_hist nfCalHist[NUM_NF_READINGS];
#endif
+40 −76
Original line number Diff line number Diff line
@@ -314,9 +314,6 @@ struct ar5416_desc {
#define RXSTATUS_RATE(ah, ads)  (AR_SREV_5416_V20_OR_LATER(ah) ?	\
				 MS(ads->ds_rxstatus0, AR_RxRate) :	\
				 (ads->ds_rxstatus3 >> 2) & 0xFF)
#define RXSTATUS_DUPLICATE(ah, ads)  (AR_SREV_5416_V20_OR_LATER(ah) ?	\
				      MS(ads->ds_rxstatus3, AR_Parallel40) : \
				      (ads->ds_rxstatus3 >> 10) & 0x1)

#define set11nTries(_series, _index) \
	(SM((_series)[_index].Tries, AR_XmitDataTries##_index))
@@ -346,9 +343,6 @@ struct ar5416_desc {
#define MAX_TX_FIFO_THRESHOLD   ((4096 / 64) - 1)
#define INIT_TX_FIFO_THRESHOLD  MIN_TX_FIFO_THRESHOLD

#define NUM_CORNER_FIX_BITS_2133    7
#define CCK_OFDM_GAIN_DELTA         15

struct ar5416AniState {
	struct ath9k_channel c;
	u8 noiseImmunityLevel;
@@ -377,9 +371,6 @@ struct ar5416AniState {
};

#define HAL_PROCESS_ANI     0x00000001
#define HAL_RADAR_EN        0x80000000
#define HAL_AR_EN           0x40000000

#define DO_ANI(ah) \
	((AH5416(ah)->ah_procPhyErr & HAL_PROCESS_ANI))

@@ -425,7 +416,6 @@ struct ar5416Stats {
#define AR5416_EEP_MINOR_VER_7       0x7
#define AR5416_EEP_MINOR_VER_9       0x9

#define AR5416_EEP_START_LOC            256
#define AR5416_NUM_5G_CAL_PIERS         8
#define AR5416_NUM_2G_CAL_PIERS         4
#define AR5416_NUM_5G_20_TARGET_POWERS  8
@@ -441,25 +431,10 @@ struct ar5416Stats {
#define AR5416_EEPROM_MODAL_SPURS       5
#define AR5416_MAX_RATE_POWER           63
#define AR5416_NUM_PDADC_VALUES         128
#define AR5416_NUM_RATES                16
#define AR5416_BCHAN_UNUSED             0xFF
#define AR5416_MAX_PWR_RANGE_IN_HALF_DB 64
#define AR5416_EEPMISC_BIG_ENDIAN       0x01
#define AR5416_MAX_CHAINS               3
#define AR5416_ANT_16S                  25

#define AR5416_NUM_ANT_CHAIN_FIELDS     7
#define AR5416_NUM_ANT_COMMON_FIELDS    4
#define AR5416_SIZE_ANT_CHAIN_FIELD     3
#define AR5416_SIZE_ANT_COMMON_FIELD    4
#define AR5416_ANT_CHAIN_MASK           0x7
#define AR5416_ANT_COMMON_MASK          0xf
#define AR5416_CHAIN_0_IDX              0
#define AR5416_CHAIN_1_IDX              1
#define AR5416_CHAIN_2_IDX              2

#define AR5416_PWR_TABLE_OFFSET         -5
#define AR5416_LEGACY_CHAINMASK         1

enum eeprom_param {
	EEP_NFTHRESH_5,
@@ -696,25 +671,29 @@ struct hal_cal_list {
struct ath_hal_5416 {
	struct ath_hal ah;
	struct ar5416_eeprom ah_eeprom;
	struct ar5416Stats ah_stats;
	struct ath9k_tx_queue_info ah_txq[ATH9K_NUM_TX_QUEUES];
	void __iomem *ah_cal_mem;

	u8 ah_macaddr[ETH_ALEN];
	u8 ah_bssid[ETH_ALEN];
	u8 ah_bssidmask[ETH_ALEN];
	u16 ah_assocId;

	int16_t ah_curchanRadIndex;
	u32 ah_maskReg;
	struct ar5416Stats ah_stats;
	u32 ah_txDescMask;
	u32 ah_txOkInterruptMask;
	u32 ah_txErrInterruptMask;
	u32 ah_txDescInterruptMask;
	u32 ah_txEolInterruptMask;
	u32 ah_txUrnInterruptMask;
	struct ath9k_tx_queue_info ah_txq[ATH9K_NUM_TX_QUEUES];
	enum ath9k_power_mode ah_powerMode;
	bool ah_chipFullSleep;
	u32 ah_atimWindow;
	enum ath9k_ant_setting ah_diversityControl;
	u16 ah_antennaSwitchSwap;
	enum ath9k_power_mode ah_powerMode;
	enum ath9k_ant_setting ah_diversityControl;

	/* Calibration */
	enum hal_cal_types ah_suppCals;
	struct hal_cal_list ah_iqCalData;
	struct hal_cal_list ah_adcGainCalData;
@@ -751,16 +730,16 @@ struct ath_hal_5416 {
		int32_t sign[AR5416_MAX_CHAINS];
	} ah_Meas3;
	u16 ah_CalSamples;
	u32 ah_tx6PowerInHalfDbm;

	u32 ah_staId1Defaults;
	u32 ah_miscMode;
	bool ah_tpcEnabled;
	u32 ah_beaconInterval;
	enum {
		AUTO_32KHZ,
		USE_32KHZ,
		DONT_USE_32KHZ,
	} ah_enable32kHzClock;

	/* RF */
	u32 *ah_analogBank0Data;
	u32 *ah_analogBank1Data;
	u32 *ah_analogBank2Data;
@@ -770,8 +749,9 @@ struct ath_hal_5416 {
	u32 *ah_analogBank7Data;
	u32 *ah_addac5416_21;
	u32 *ah_bank6Temp;
	u32 ah_ofdmTxPower;

	int16_t ah_txPowerIndexOffset;
	u32 ah_beaconInterval;
	u32 ah_slottime;
	u32 ah_acktimeout;
	u32 ah_ctstimeout;
@@ -780,7 +760,8 @@ struct ath_hal_5416 {
	u32 ah_gpioSelect;
	u32 ah_polarity;
	u32 ah_gpioBit;
	bool ah_eepEnabled;

	/* ANI */
	u32 ah_procPhyErr;
	bool ah_hasHwPhyCounters;
	u32 ah_aniPeriod;
@@ -790,18 +771,14 @@ struct ath_hal_5416 {
	int ah_coarseHigh[5];
	int ah_coarseLow[5];
	int ah_firpwr[5];
	u16 ah_ratesArray[16];
	enum ath9k_ani_cmd ah_ani_function;

	u32 ah_intrTxqs;
	bool ah_intrMitigation;
	u32 ah_cycleCount;
	u32 ah_ctlBusy;
	u32 ah_extBusy;
	enum ath9k_ht_extprotspacing ah_extprotspacing;
	u8 ah_txchainmask;
	u8 ah_rxchainmask;
	int ah_hwp;
	void __iomem *ah_cal_mem;
	enum ath9k_ani_cmd ah_ani_function;

	struct ar5416IniArray ah_iniModes;
	struct ar5416IniArray ah_iniCommon;
	struct ar5416IniArray ah_iniBank0;
@@ -820,10 +797,6 @@ struct ath_hal_5416 {

#define FREQ2FBIN(x, y) ((y) ? ((x) - 2300) : (((x) - 4800) / 5))

#define IS_5416_EMU(ah)					\
	((ah->ah_devid == AR5416_DEVID_EMU) ||		\
	 (ah->ah_devid == AR5416_DEVID_EMU_PCIE))

#define ar5416RfDetach(ah) do {					\
		if (AH5416(ah)->ah_rfHal.rfDetach != NULL)	\
			AH5416(ah)->ah_rfHal.rfDetach(ah);	\
@@ -871,11 +844,6 @@ struct ath_hal_5416 {
	(((_txchainmask >> 2) & 1) + \
		((_txchainmask >> 1) & 1) + (_txchainmask & 1))

#define IS_EEP_MINOR_V3(_ahp) \
	(ath9k_hw_get_eeprom((_ahp), EEP_MINOR_REV)  >= AR5416_EEP_MINOR_VER_3)

#define FIXED_CCA_THRESHOLD 15

#ifdef __BIG_ENDIAN
#define AR5416_EEPROM_MAGIC 0x5aa5
#else
@@ -910,8 +878,6 @@ struct ath_hal_5416 {
#define AR_GPIOD_MASK                   0x00001FFF
#define AR_GPIO_BIT(_gpio)              (1 << (_gpio))

#define MAX_ANALOG_START                319

#define HAL_EP_RND(x, mul) \
	((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))
#define BEACON_RSSI(ahp) \
@@ -923,8 +889,6 @@ struct ath_hal_5416 {
#define AH_TIMEOUT         100000
#define AH_TIME_QUANTUM        10

#define IS(_c, _f)       (((_c)->channelFlags & _f) || 0)

#define AR_KEYTABLE_SIZE 128
#define POWER_UP_TIME    200000