Commit 6a8a3f6b authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: move ath5k_hw_calibration_poll to base.c 



It's not a phy related funtion; It has more to do with the interrupt handler
and tasklet scheduling, so it belongs to base.c.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a9167f96

drivers/net/wireless/ath/ath5k/ath5k.h

+0 −1
Original line number Diff line number Diff line
@@ -1254,7 +1254,6 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel); 
void ath5k_hw_init_nfcal_hist(struct ath5k_hw *ah);

int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,

			   struct ieee80211_channel *channel);

void ath5k_hw_calibration_poll(struct ath5k_hw *ah);

/* Spur mitigation */

bool ath5k_hw_chan_has_spur_noise(struct ath5k_hw *ah,

				  struct ieee80211_channel *channel);

drivers/net/wireless/ath/ath5k/base.c

+14 −1
Original line number Diff line number Diff line
@@ -2625,6 +2625,19 @@ ath5k_stop_hw(struct ath5k_softc *sc) 
	return ret;

}



static void

ath5k_intr_calibration_poll(struct ath5k_hw *ah)

{

	if (time_is_before_eq_jiffies(ah->ah_cal_next_full)) {

		ah->ah_cal_next_full = jiffies +

			msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL);

		tasklet_schedule(&ah->ah_sc->calib);

	}

	/* we could use SWI to generate enough interrupts to meet our

	 * calibration interval requirements, if necessary:

	 * AR5K_REG_ENABLE_BITS(ah, AR5K_CR, AR5K_CR_SWI); */

}



static irqreturn_t

ath5k_intr(int irq, void *dev_id)

{
@@ -2689,7 +2702,7 @@ ath5k_intr(int irq, void *dev_id) 
	if (unlikely(!counter))

		ATH5K_WARN(sc, "too many interrupts, giving up for now\n");



	ath5k_hw_calibration_poll(ah);

	ath5k_intr_calibration_poll(ah);



	return IRQ_HANDLED;

}

drivers/net/wireless/ath/ath5k/phy.c

+0 −13
Original line number Diff line number Diff line
@@ -1102,19 +1102,6 @@ int ath5k_hw_channel(struct ath5k_hw *ah, struct ieee80211_channel *channel) 
  PHY calibration

\*****************/



void

ath5k_hw_calibration_poll(struct ath5k_hw *ah)

{

	if (time_is_before_eq_jiffies(ah->ah_cal_next_full)) {

		ah->ah_cal_next_full = jiffies +

			msecs_to_jiffies(ATH5K_TUNE_CALIBRATION_INTERVAL_FULL);

		tasklet_schedule(&ah->ah_sc->calib);

	}

	/* we could use SWI to generate enough interrupts to meet our

	 * calibration interval requirements, if necessary:

	 * AR5K_REG_ENABLE_BITS(ah, AR5K_CR, AR5K_CR_SWI); */

}



static int sign_extend(int val, const int nbits)

{

	int order = BIT(nbits-1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE