Commit 5ee3e780 authored by Allen Pais's avatar Allen Pais Committed by Felix Fietkau
Browse files

wireless: mt76: 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 <apais@linux.microsoft.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 30578752

drivers/net/wireless/mediatek/mt76/mt7603/beacon.c

+2 −2
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ mt7603_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif) 
	data->count[mvif->idx]++;

}



void mt7603_pre_tbtt_tasklet(unsigned long arg)

void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)

{

	struct mt7603_dev *dev = (struct mt7603_dev *)arg;

	struct mt7603_dev *dev = from_tasklet(dev, t, mt76.pre_tbtt_tasklet);

	struct mt76_queue *q;

	struct beacon_bc_data data = {};

	struct sk_buff *skb;

drivers/net/wireless/mediatek/mt76/mt7603/init.c

+1 −2
Original line number Diff line number Diff line
@@ -533,8 +533,7 @@ int mt7603_register_device(struct mt7603_dev *dev) 
	spin_lock_init(&dev->ps_lock);



	INIT_DELAYED_WORK(&dev->mt76.mac_work, mt7603_mac_work);

	tasklet_init(&dev->mt76.pre_tbtt_tasklet, mt7603_pre_tbtt_tasklet,

		     (unsigned long)dev);

	tasklet_setup(&dev->mt76.pre_tbtt_tasklet, mt7603_pre_tbtt_tasklet);



	dev->slottime = 9;

	dev->sensitivity_limit = 28;

drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ void mt7603_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
void mt7603_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta);



void mt7603_pre_tbtt_tasklet(unsigned long arg);

void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t);



void mt7603_update_channel(struct mt76_dev *mdev);

drivers/net/wireless/mediatek/mt76/mt7615/mmio.c

+3 −3
Original line number Diff line number Diff line
@@ -98,9 +98,9 @@ static irqreturn_t mt7615_irq_handler(int irq, void *dev_instance) 
	return IRQ_HANDLED;

}



static void mt7615_irq_tasklet(unsigned long data)

static void mt7615_irq_tasklet(struct tasklet_struct *t)

{

	struct mt7615_dev *dev = (struct mt7615_dev *)data;

	struct mt7615_dev *dev = from_tasklet(dev, t, irq_tasklet);

	u32 intr, mask = 0, tx_mcu_mask = mt7615_tx_mcu_int_mask(dev);



	mt76_wr(dev, MT_INT_MASK_CSR, 0);
@@ -203,7 +203,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, 


	dev = container_of(mdev, struct mt7615_dev, mt76);

	mt76_mmio_init(&dev->mt76, mem_base);

	tasklet_init(&dev->irq_tasklet, mt7615_irq_tasklet, (unsigned long)dev);

	tasklet_setup(&dev->irq_tasklet, mt7615_irq_tasklet);



	dev->reg_map = map;

	dev->ops = ops;

drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c

+5 −5
Original line number Diff line number Diff line
@@ -609,10 +609,11 @@ static void mt76x02_dfs_check_event_window(struct mt76x02_dev *dev) 
	}

}



static void mt76x02_dfs_tasklet(unsigned long arg)

static void mt76x02_dfs_tasklet(struct tasklet_struct *t)

{

	struct mt76x02_dev *dev = (struct mt76x02_dev *)arg;

	struct mt76x02_dfs_pattern_detector *dfs_pd = &dev->dfs_pd;

	struct mt76x02_dfs_pattern_detector *dfs_pd = from_tasklet(dfs_pd, t,

								   dfs_tasklet);

	struct mt76x02_dev *dev = container_of(dfs_pd, typeof(*dev), dfs_pd);

	u32 engine_mask;

	int i;
@@ -860,8 +861,7 @@ void mt76x02_dfs_init_detector(struct mt76x02_dev *dev) 
	INIT_LIST_HEAD(&dfs_pd->seq_pool);

	dev->mt76.region = NL80211_DFS_UNSET;

	dfs_pd->last_sw_check = jiffies;

	tasklet_init(&dfs_pd->dfs_tasklet, mt76x02_dfs_tasklet,

		     (unsigned long)dev);

	tasklet_setup(&dfs_pd->dfs_tasklet, mt76x02_dfs_tasklet);

}



static void