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

Commit 23bd7ced authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

ath9k: move ath9k_hw_fbin2freq function to eeprom.h 



Both eeprom.c and ar9003_eeprom.c has an indentical
'ath9k_hw_fbin2freq' function. Move the function to
a common place and remove the duplicates.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 86ae26d7

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

+0 −9
Original line number Diff line number Diff line
@@ -2931,15 +2931,6 @@ static const struct ar9300_eeprom *ar9003_eeprom_struct_find_by_id(int id) 
#undef N_LOOP

}





static u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)

{

	if (fbin == AR5416_BCHAN_UNUSED)

		return fbin;



	return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));

}



static int ath9k_hw_ar9300_check_eeprom(struct ath_hw *ah)

{

	return 0;

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

+0 −8
Original line number Diff line number Diff line
@@ -16,14 +16,6 @@ 


#include "hw.h"



static inline u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)

{

	if (fbin == AR5416_BCHAN_UNUSED)

		return fbin;



	return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));

}



void ath9k_hw_analog_shift_regwrite(struct ath_hw *ah, u32 reg, u32 val)

{

        REG_WRITE(ah, reg, val);

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

+8 −0
Original line number Diff line number Diff line
@@ -699,6 +699,14 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah, 
				u16 *pPdGainBoundaries, u8 *pPDADCValues,

				u16 numXpdGains);



static inline u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)

{

	if (fbin == AR5416_BCHAN_UNUSED)

		return fbin;



	return (u16) ((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin));

}



#define ar5416_get_ntxchains(_txchainmask)			\

	(((_txchainmask >> 2) & 1) +                            \

	 ((_txchainmask >> 1) & 1) + (_txchainmask & 1))