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

Commit 6da5a720 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: clean up SREV version checks 



There's no need to have separate callbacks for pre-AR9003 vs AR9003
SREV version checks, so just merge those into one function.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent df3c8b2b

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

+0 −19
Original line number Diff line number Diff line
@@ -26,24 +26,6 @@ MODULE_PARM_DESC(nohwcrypt, "Force new ANI for AR5008, AR9001, AR9002"); 


/* General hardware code for the A5008/AR9001/AR9002 hadware families */



static bool ar9002_hw_macversion_supported(u32 macversion)

{

	switch (macversion) {

	case AR_SREV_VERSION_5416_PCI:

	case AR_SREV_VERSION_5416_PCIE:

	case AR_SREV_VERSION_9160:

	case AR_SREV_VERSION_9100:

	case AR_SREV_VERSION_9280:

	case AR_SREV_VERSION_9285:

	case AR_SREV_VERSION_9287:

	case AR_SREV_VERSION_9271:

		return true;

	default:

		break;

	}

	return false;

}



static void ar9002_hw_init_mode_regs(struct ath_hw *ah)

{

	if (AR_SREV_9271(ah)) {
@@ -565,7 +547,6 @@ void ar9002_hw_attach_ops(struct ath_hw *ah) 


	priv_ops->init_mode_regs = ar9002_hw_init_mode_regs;

	priv_ops->init_mode_gain_regs = ar9002_hw_init_mode_gain_regs;

	priv_ops->macversion_supported = ar9002_hw_macversion_supported;



	ops->config_pci_powersave = ar9002_hw_configpcipowersave;

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

+0 −13
Original line number Diff line number Diff line
@@ -21,18 +21,6 @@ 


/* General hardware code for the AR9003 hadware family */



static bool ar9003_hw_macversion_supported(u32 macversion)

{

	switch (macversion) {

	case AR_SREV_VERSION_9300:

	case AR_SREV_VERSION_9485:

		return true;

	default:

		break;

	}

	return false;

}



/*

 * The AR9003 family uses a new INI format (pre, core, post

 * arrays per subsystem). This provides support for the
@@ -322,7 +310,6 @@ void ar9003_hw_attach_ops(struct ath_hw *ah) 


	priv_ops->init_mode_regs = ar9003_hw_init_mode_regs;

	priv_ops->init_mode_gain_regs = ar9003_hw_init_mode_gain_regs;

	priv_ops->macversion_supported = ar9003_hw_macversion_supported;



	ops->config_pci_powersave = ar9003_hw_configpcipowersave;

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

+13 −8
Original line number Diff line number Diff line
@@ -54,13 +54,6 @@ static void ath9k_hw_init_mode_regs(struct ath_hw *ah) 
	ath9k_hw_private_ops(ah)->init_mode_regs(ah);

}



static bool ath9k_hw_macversion_supported(struct ath_hw *ah)

{

	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);



	return priv_ops->macversion_supported(ah->hw_version.macVersion);

}



static u32 ath9k_hw_compute_pll_control(struct ath_hw *ah,

					struct ath9k_channel *chan)

{
@@ -534,7 +527,19 @@ static int __ath9k_hw_init(struct ath_hw *ah) 
	else

		ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD;



	if (!ath9k_hw_macversion_supported(ah)) {

	switch (ah->hw_version.macVersion) {

	case AR_SREV_VERSION_5416_PCI:

	case AR_SREV_VERSION_5416_PCIE:

	case AR_SREV_VERSION_9160:

	case AR_SREV_VERSION_9100:

	case AR_SREV_VERSION_9280:

	case AR_SREV_VERSION_9285:

	case AR_SREV_VERSION_9287:

	case AR_SREV_VERSION_9271:

	case AR_SREV_VERSION_9300:

	case AR_SREV_VERSION_9485:

		break;

	default:

		ath_err(common,

			"Mac Chip Rev 0x%02x.%x is not supported by this driver\n",

			ah->hw_version.macVersion, ah->hw_version.macRev);

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

+0 −2
Original line number Diff line number Diff line
@@ -532,7 +532,6 @@ struct ath_hw_radar_conf { 
 *

 * @init_mode_regs: Initializes mode registers

 * @init_mode_gain_regs: Initialize TX/RX gain registers

 * @macversion_supported: If this specific mac revision is supported

 *

 * @rf_set_freq: change frequency

 * @spur_mitigate_freq: spur mitigation
@@ -554,7 +553,6 @@ struct ath_hw_private_ops { 


	void (*init_mode_regs)(struct ath_hw *ah);

	void (*init_mode_gain_regs)(struct ath_hw *ah);

	bool (*macversion_supported)(u32 macversion);

	void (*setup_calibration)(struct ath_hw *ah,

				  struct ath9k_cal_list *currCal);