Commit f799a301 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k_hw: remove warning in ath9k_hw_def_get_num_ant_config 



This patch fixes following warning

drivers/net/wireless/ath/ath9k/eeprom_def.c: In function 'ath9k_hw_def_get_num_ant_config'
drivers/net/wireless/ath/ath9k/eeprom_def.c:1425:47: warning: comparison
			between 'enum ath9k_hal_freq_band' and 'enum ieee80211_band'

Signed-off-by: default avatarRajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 65a602dd

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

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ static int ath9k_hw_ar9300_get_eeprom_rev(struct ath_hw *ah) 
}



static u8 ath9k_hw_ar9300_get_num_ant_config(struct ath_hw *ah,

					     enum ieee80211_band freq_band)

					     enum ath9k_hal_freq_band freq_band)

{

	return 1;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -672,7 +672,8 @@ struct eeprom_ops { 
	bool (*fill_eeprom)(struct ath_hw *hw);

	int (*get_eeprom_ver)(struct ath_hw *hw);

	int (*get_eeprom_rev)(struct ath_hw *hw);

	u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band);

	u8 (*get_num_ant_config)(struct ath_hw *hw,

				 enum ath9k_hal_freq_band band);

	u32 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,

				      struct ath9k_channel *chan);

	void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan);

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

+1 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ static u32 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah, 
}



static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah,

					 enum ieee80211_band freq_band)

					 enum ath9k_hal_freq_band freq_band)

{

	return 1;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static void ath9k_hw_ar9287_set_board_values(struct ath_hw *ah, 
}



static u8 ath9k_hw_ar9287_get_num_ant_config(struct ath_hw *ah,

					     enum ieee80211_band freq_band)

					     enum ath9k_hal_freq_band freq_band)

{

	return 1;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -1418,11 +1418,11 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah, 
}



static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah,

					  enum ieee80211_band freq_band)

					  enum ath9k_hal_freq_band freq_band)

{

	struct ar5416_eeprom_def *eep = &ah->eeprom.def;

	struct modal_eep_header *pModal =

		&(eep->modalHeader[ATH9K_HAL_FREQ_BAND_2GHZ == freq_band]);

		&(eep->modalHeader[freq_band]);

	struct base_eep_header *pBase = &eep->baseEepHeader;

	u8 num_ant_config;

CRA Git | Maintained and supported by SUSTech CRA and CCSE