Commit ec193b41 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

wifi: mt76: move irq_tasklet in mt76_dev struct 



irq_tasklet struct is used by most of the drivers (e.g. mt7915, mt7921,
mt7615, mt7663 and mt7996) so move it in common code.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 09d4d6da

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

+1 −0
Original line number Diff line number Diff line
@@ -788,6 +788,7 @@ struct mt76_dev { 
	spinlock_t rx_lock;

	struct napi_struct napi[__MT_RXQ_MAX];

	struct sk_buff_head rx_skb[__MT_RXQ_MAX];

	struct tasklet_struct irq_tasklet;



	struct list_head txwi_cache;

	struct list_head rxwi_cache;

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

+3 −3
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ static irqreturn_t mt7615_irq_handler(int irq, void *dev_instance) 
	if (!test_bit(MT76_STATE_INITIALIZED, &dev->mphy.state))

		return IRQ_NONE;



	tasklet_schedule(&dev->irq_tasklet);

	tasklet_schedule(&dev->mt76.irq_tasklet);



	return IRQ_HANDLED;

}



static void mt7615_irq_tasklet(struct tasklet_struct *t)

{

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

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

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

	u32 mcu_int;
@@ -202,7 +202,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_setup(&dev->irq_tasklet, mt7615_irq_tasklet);

	tasklet_setup(&mdev->irq_tasklet, mt7615_irq_tasklet);



	dev->reg_map = map;

	dev->ops = ops;

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

+1 −3
Original line number Diff line number Diff line
@@ -245,8 +245,6 @@ struct mt7615_dev { 
	};



	const struct mt76_bus_ops *bus_ops;

	struct tasklet_struct irq_tasklet;



	struct mt7615_phy phy;

	u64 omac_mask;
@@ -416,7 +414,7 @@ static inline void mt7615_irq_enable(struct mt7615_dev *dev, u32 mask) 
{

	mt76_set_irq_mask(&dev->mt76, 0, 0, mask);



	tasklet_schedule(&dev->irq_tasklet);

	tasklet_schedule(&dev->mt76.irq_tasklet);

}



static inline bool mt7615_firmware_offload(struct mt7615_dev *dev)

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int mt7615_pci_suspend(struct pci_dev *pdev, pm_message_t state) 
	mt76_for_each_q_rx(mdev, i) {

		napi_disable(&mdev->napi[i]);

	}

	tasklet_kill(&dev->irq_tasklet);

	tasklet_kill(&mdev->irq_tasklet);



	mt7615_dma_reset(dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void mt7615_unregister_device(struct mt7615_dev *dev) 


	mt7615_tx_token_put(dev);

	mt7615_dma_cleanup(dev);

	tasklet_disable(&dev->irq_tasklet);

	tasklet_disable(&dev->mt76.irq_tasklet);



	mt76_free_device(&dev->mt76);

}