Commit c068a9ec authored by Allen Pais's avatar Allen Pais Committed by Kalle Valo
Browse files

ath5k: convert tasklets to use new tasklet_setup() API 



In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <allen.lkml@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200817090637.26887-2-allen.cryptic@gmail.com
parent c6522a50

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

+12 −12
Original line number Diff line number Diff line
@@ -1536,12 +1536,12 @@ ath5k_set_current_imask(struct ath5k_hw *ah) 
}



static void

ath5k_tasklet_rx(unsigned long data)

ath5k_tasklet_rx(struct tasklet_struct *t)

{

	struct ath5k_rx_status rs = {};

	struct sk_buff *skb, *next_skb;

	dma_addr_t next_skb_addr;

	struct ath5k_hw *ah = (void *)data;

	struct ath5k_hw *ah = from_tasklet(ah, t, rxtq);

	struct ath_common *common = ath5k_hw_common(ah);

	struct ath5k_buf *bf;

	struct ath5k_desc *ds;
@@ -1784,10 +1784,10 @@ ath5k_tx_processq(struct ath5k_hw *ah, struct ath5k_txq *txq) 
}



static void

ath5k_tasklet_tx(unsigned long data)

ath5k_tasklet_tx(struct tasklet_struct *t)

{

	int i;

	struct ath5k_hw *ah = (void *)data;

	struct ath5k_hw *ah = from_tasklet(ah, t, txtq);



	for (i = 0; i < AR5K_NUM_TX_QUEUES; i++)

		if (ah->txqs[i].setup && (ah->ah_txq_isr_txok_all & BIT(i)))
@@ -2176,9 +2176,9 @@ ath5k_beacon_config(struct ath5k_hw *ah) 
	spin_unlock_bh(&ah->block);

}



static void ath5k_tasklet_beacon(unsigned long data)

static void ath5k_tasklet_beacon(struct tasklet_struct *t)

{

	struct ath5k_hw *ah = (struct ath5k_hw *) data;

	struct ath5k_hw *ah = from_tasklet(ah, t, beacontq);



	/*

	 * Software beacon alert--time to send a beacon.
@@ -2447,9 +2447,9 @@ ath5k_calibrate_work(struct work_struct *work) 




static void

ath5k_tasklet_ani(unsigned long data)

ath5k_tasklet_ani(struct tasklet_struct *t)

{

	struct ath5k_hw *ah = (void *)data;

	struct ath5k_hw *ah = from_tasklet(ah, t, ani_tasklet);



	ah->ah_cal_mask |= AR5K_CALIBRATION_ANI;

	ath5k_ani_calibration(ah);
@@ -3069,10 +3069,10 @@ ath5k_init(struct ieee80211_hw *hw) 
		hw->queues = 1;

	}



	tasklet_init(&ah->rxtq, ath5k_tasklet_rx, (unsigned long)ah);

	tasklet_init(&ah->txtq, ath5k_tasklet_tx, (unsigned long)ah);

	tasklet_init(&ah->beacontq, ath5k_tasklet_beacon, (unsigned long)ah);

	tasklet_init(&ah->ani_tasklet, ath5k_tasklet_ani, (unsigned long)ah);

	tasklet_setup(&ah->rxtq, ath5k_tasklet_rx);

	tasklet_setup(&ah->txtq, ath5k_tasklet_tx);

	tasklet_setup(&ah->beacontq, ath5k_tasklet_beacon);

	tasklet_setup(&ah->ani_tasklet, ath5k_tasklet_ani);



	INIT_WORK(&ah->reset_work, ath5k_reset_work);

	INIT_WORK(&ah->calib_work, ath5k_calibrate_work);

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

+3 −4
Original line number Diff line number Diff line
@@ -73,9 +73,9 @@ ath5k_is_rfkill_set(struct ath5k_hw *ah) 
}



static void

ath5k_tasklet_rfkill_toggle(unsigned long data)

ath5k_tasklet_rfkill_toggle(struct tasklet_struct *t)

{

	struct ath5k_hw *ah = (void *)data;

	struct ath5k_hw *ah = from_tasklet(ah, t, rf_kill.toggleq);

	bool blocked;



	blocked = ath5k_is_rfkill_set(ah);
@@ -90,8 +90,7 @@ ath5k_rfkill_hw_start(struct ath5k_hw *ah) 
	ah->rf_kill.gpio = ah->ah_capabilities.cap_eeprom.ee_rfkill_pin;

	ah->rf_kill.polarity = ah->ah_capabilities.cap_eeprom.ee_rfkill_pol;



	tasklet_init(&ah->rf_kill.toggleq, ath5k_tasklet_rfkill_toggle,

		(unsigned long)ah);

	tasklet_setup(&ah->rf_kill.toggleq, ath5k_tasklet_rfkill_toggle);



	ath5k_rfkill_disable(ah);