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

ath9k: 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-3-allen.cryptic@gmail.com
parent e5851849

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

+2 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ struct ath_beacon { 
	bool tx_last;

};



void ath9k_beacon_tasklet(unsigned long data);

void ath9k_beacon_tasklet(struct tasklet_struct *t);

void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif,

			 bool beacons);

void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
@@ -1117,7 +1117,7 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz) 
	common->bus_ops->read_cachesize(common, csz);

}



void ath9k_tasklet(unsigned long data);

void ath9k_tasklet(struct tasklet_struct *t);

int ath_cabq_update(struct ath_softc *);

u8 ath9k_parse_mpdudensity(u8 mpdudensity);

irqreturn_t ath_isr(int irq, void *dev);

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

+2 −2
Original line number Diff line number Diff line
@@ -385,9 +385,9 @@ void ath9k_csa_update(struct ath_softc *sc) 
						   ath9k_csa_update_vif, sc);

}



void ath9k_beacon_tasklet(unsigned long data)

void ath9k_beacon_tasklet(struct tasklet_struct *t)

{

	struct ath_softc *sc = (struct ath_softc *)data;

	struct ath_softc *sc = from_tasklet(sc, t, bcon_tasklet);

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_buf *bf = NULL;

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

+2 −2
Original line number Diff line number Diff line
@@ -583,14 +583,14 @@ int ath9k_htc_tx_get_slot(struct ath9k_htc_priv *priv); 
void ath9k_htc_tx_clear_slot(struct ath9k_htc_priv *priv, int slot);

void ath9k_htc_tx_drain(struct ath9k_htc_priv *priv);

void ath9k_htc_txstatus(struct ath9k_htc_priv *priv, void *wmi_event);

void ath9k_tx_failed_tasklet(unsigned long data);

void ath9k_tx_failed_tasklet(struct tasklet_struct *t);

void ath9k_htc_tx_cleanup_timer(struct timer_list *t);

bool ath9k_htc_csa_is_finished(struct ath9k_htc_priv *priv);



int ath9k_rx_init(struct ath9k_htc_priv *priv);

void ath9k_rx_cleanup(struct ath9k_htc_priv *priv);

void ath9k_host_rx_init(struct ath9k_htc_priv *priv);

void ath9k_rx_tasklet(unsigned long data);

void ath9k_rx_tasklet(struct tasklet_struct *t);

u32 ath9k_htc_calcrxfilter(struct ath9k_htc_priv *priv);



void ath9k_htc_ps_wakeup(struct ath9k_htc_priv *priv);

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

+2 −4
Original line number Diff line number Diff line
@@ -645,10 +645,8 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, 
	spin_lock_init(&priv->tx.tx_lock);

	mutex_init(&priv->mutex);

	mutex_init(&priv->htc_pm_lock);

	tasklet_init(&priv->rx_tasklet, ath9k_rx_tasklet,

		     (unsigned long)priv);

	tasklet_init(&priv->tx_failed_tasklet, ath9k_tx_failed_tasklet,

		     (unsigned long)priv);

	tasklet_setup(&priv->rx_tasklet, ath9k_rx_tasklet);

	tasklet_setup(&priv->tx_failed_tasklet, ath9k_tx_failed_tasklet);

	INIT_DELAYED_WORK(&priv->ani_work, ath9k_htc_ani_work);

	INIT_WORK(&priv->ps_work, ath9k_ps_work);

	INIT_WORK(&priv->fatal_work, ath9k_fatal_work);

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

+4 −4
Original line number Diff line number Diff line
@@ -570,9 +570,9 @@ void ath9k_htc_tx_drain(struct ath9k_htc_priv *priv) 
	spin_unlock_bh(&priv->tx.tx_lock);

}



void ath9k_tx_failed_tasklet(unsigned long data)

void ath9k_tx_failed_tasklet(struct tasklet_struct *t)

{

	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *)data;

	struct ath9k_htc_priv *priv = from_tasklet(priv, t, tx_failed_tasklet);



	spin_lock(&priv->tx.tx_lock);

	if (priv->tx.flags & ATH9K_HTC_OP_TX_DRAIN) {
@@ -1062,9 +1062,9 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, 
/*

 * FIXME: Handle FLUSH later on.

 */

void ath9k_rx_tasklet(unsigned long data)

void ath9k_rx_tasklet(struct tasklet_struct *t)

{

	struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *)data;

	struct ath9k_htc_priv *priv = from_tasklet(priv, t, rx_tasklet);

	struct ath9k_htc_rxbuf *rxbuf = NULL, *tmp_buf = NULL;

	struct ieee80211_rx_status rx_status;

	struct sk_buff *skb;