wireless: convert tasklets to use new tasklet_setup() API
Subsystems (6)
From: Allen Pais <[email protected]>
This series converts the remaining drivers to use newtasklet_setup() API.
The patches are based on wireless-drivers-next.git
Allen Pais (2):
ath11k: convert tasklets to use new tasklet_setup() API
wireless: mt76: convert tasklets to use new tasklet_setup() API
drivers/net/wireless/ath/ath11k/pci.c | 7 +++---- drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7603/init.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 10 +++++----- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 7 +++---- drivers/net/wireless/mediatek/mt76/usb.c | 6 +++--- drivers/net/wireless/mediatek/mt7601u/dma.c | 12 ++++++------ 9 files changed, 27 insertions(+), 30 deletions(-)
Signature · 7 lines
2.25.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 1/2 ath11k: convert tasklets to use new tasklet_setup() API
From: Allen Pais <[email protected]>
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.
--- drivers/net/wireless/ath/ath11k/pci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/pci.c +3 -4
@@ -380,9 +380,9 @@ static void ath11k_pci_sync_ce_irqs(struct ath11k_base *ab) } } -static void ath11k_pci_ce_tasklet (unsigned long data) +static void ath11k_pci_ce_tasklet (struct tasklet_struct *t) { -struct ath11k_ce_pipe *ce_pipe = (struct ath11k_ce_pipe *)data; +struct ath11k_ce_pipe *ce_pipe =from_tasklet (ce_pipe, t, intr_tq);ath11k_ce_per_engine_service (ce_pipe->ab, ce_pipe->pipe_num);
@@ -581,8 +581,7 @@ static int ath11k_pci_config_irq(struct ath11k_base *ab) irq_idx =ATH11K_PCI_IRQ_CE0_OFFSET + i; -tasklet_init (&ce_pipe->intr_tq, ath11k_pci_ce_tasklet, - (unsigned long )ce_pipe); +tasklet_setup (&ce_pipe->intr_tq, ath11k_pci_ce_tasklet); ret = request_irq(irq, ath11k_pci_ce_interrupt_handler, IRQF_SHARED, irq_name[irq_idx],
Signature · 7 lines
2.25.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 2/2 wireless: mt76: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisFrom: Allen Pais <[email protected]>
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.
--- drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7603/init.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 10 +++++----- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 7 +++---- drivers/net/wireless/mediatek/mt76/usb.c | 6 +++--- drivers/net/wireless/mediatek/mt7601u/dma.c | 12 ++++++------ 8 files changed, 24 insertions(+), 26 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/beacon.c +2 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +3 -4
@@ -11,9 +11,9 @@#include "mt76x02_mcu.h" #include "trace.h" -static void mt76x02_pre_tbtt_tasklet (unsigned long arg) +static void mt76x02_pre_tbtt_tasklet (struct tasklet_struct *t) { -struct mt76x02_dev *dev = (struct mt76x02_dev *)arg; +struct mt76x02_dev *dev =from_tasklet (dev, t, mt76.pre_tbtt_tasklet);struct mt76_queue *q = dev->mt76.q_tx[MT_TXQ_PSD ];struct beacon_bc_data data = {};struct sk_buff *skb;
@@ -198,8 +198,7 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)return -ENOMEM ; dev->mt76.tx_worker.fn = mt76x02_tx_worker; -tasklet_init (&dev->mt76.pre_tbtt_tasklet, mt76x02_pre_tbtt_tasklet, - (unsigned long )dev); +tasklet_setup (&dev->mt76.pre_tbtt_tasklet, mt76x02_pre_tbtt_tasklet);spin_lock_init (&dev->txstatus_fifo_lock);kfifo_init (&dev->txstatus_fifo, status_fifo, fifo_size);
drivers/net/wireless/mediatek/mt76/usb.c +3 -3
@@ -669,9 +669,9 @@ mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)mt76_rx_poll_complete (dev,MT_RXQ_MAIN ,NULL ); } -static void mt76u_rx_tasklet (unsigned long data) +static void mt76u_rx_tasklet (struct tasklet_struct *t) { -struct mt76_dev *dev = (struct mt76_dev *)data; +struct mt76_dev *dev =from_tasklet (dev, t, usb.rx_tasklet);int i;rcu_read_lock ();
@@ -1110,7 +1110,7 @@ int mt76u_init(struct mt76_dev *dev, mt76u_ops.write_copy = ext ? mt76u_copy_ext : mt76u_copy; dev->tx_worker.fn = mt76u_tx_worker; -tasklet_init (&usb->rx_tasklet, mt76u_rx_tasklet, (unsigned long )dev); +tasklet_setup (&usb->rx_tasklet, mt76u_rx_tasklet);INIT_WORK (&usb->stat_work, mt76u_tx_status_data); usb->data_len =usb_maxpacket (udev,usb_sndctrlpipe (udev,0 ),1 );
drivers/net/wireless/mediatek/mt7601u/dma.c +6 -6
@@ -212,9 +212,9 @@ static void mt7601u_complete_rx(struct urb *urb)spin_unlock_irqrestore (&dev->rx_lock, flags); } -static void mt7601u_rx_tasklet (unsigned long data) +static void mt7601u_rx_tasklet (struct tasklet_struct *t) { -struct mt7601u_dev *dev = (struct mt7601u_dev *) data; +struct mt7601u_dev *dev =from_tasklet (dev, t, rx_tasklet);struct mt7601u_dma_buf_rx *e;while ((e =mt7601u_rx_get_pending_entry (dev))) {
@@ -266,9 +266,9 @@ static void mt7601u_complete_tx(struct urb *urb)spin_unlock_irqrestore (&dev->tx_lock, flags); } -static void mt7601u_tx_tasklet (unsigned long data) +static void mt7601u_tx_tasklet (struct tasklet_struct *t) { -struct mt7601u_dev *dev = (struct mt7601u_dev *) data; +struct mt7601u_dev *dev =from_tasklet (dev, t, tx_tasklet);struct sk_buff_head skbs;unsigned long flags;
@@ -507,8 +507,8 @@ int mt7601u_dma_init(struct mt7601u_dev *dev) {int ret = -ENOMEM ; -tasklet_init (&dev->tx_tasklet, mt7601u_tx_tasklet, (unsigned long ) dev); -tasklet_init (&dev->rx_tasklet, mt7601u_rx_tasklet, (unsigned long ) dev); +tasklet_setup (&dev->tx_tasklet, mt7601u_tx_tasklet); +tasklet_setup (&dev->rx_tasklet, mt7601u_rx_tasklet); ret =mt7601u_alloc_tx (dev);if (ret)
Signature · 7 lines
2.25.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH 2/2] wireless: mt76: convert tasklets to use new tasklet_setup() API
Quoted 9 lines · Allen Pais
From: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct
tasklet_structpointer to all tasklet callbacks, switch to using the newtasklet_setup()andfrom_tasklet()to pass the tasklet pointer explicitly.Signed-off-by Romain Perier <[email protected]>Signed-off-by Allen Pais <[email protected]>
Quoted 9 lines
--- drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt7603/init.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c | 10 +++++----- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 7 +++---- drivers/net/wireless/mediatek/mt76/usb.c | 6 +++--- drivers/net/wireless/mediatek/mt7601u/dma.c | 12 ++++++------
mt76 and mt7601u patches go into separate trees, so please split the patch into two.
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches