diff options
| author | Lorenzo Bianconi <lorenzo@kernel.org> | 2020-02-10 13:36:48 +0300 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2020-02-14 12:17:45 +0300 |
| commit | 5d5a99464abb00b51dd3b47e6c11793ef1d66ec2 (patch) | |
| tree | 09c1a5c4f9a4ac7ce59e2ff62f894220a77d8222 /drivers/net/wireless | |
| parent | 972c598133d89d557479c70dfff2f52a9c62a472 (diff) | |
| download | linux-5d5a99464abb00b51dd3b47e6c11793ef1d66ec2.tar.xz | |
mt76: mt76u: rename stat_wq in wq
Rename usb stat_wq in wq in order to be reused not just for gathering hw
tx statistics
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/usb.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index 3809d9afdcee..002e142ca893 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -400,7 +400,7 @@ struct mt76_usb { u16 data_len; struct tasklet_struct rx_tasklet; - struct workqueue_struct *stat_wq; + struct workqueue_struct *wq; struct work_struct stat_work; u8 out_ep[__MT_EP_OUT_MAX]; diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c index 981d8a985557..3aa1425049d9 100644 --- a/drivers/net/wireless/mediatek/mt76/usb.c +++ b/drivers/net/wireless/mediatek/mt76/usb.c @@ -852,7 +852,7 @@ static void mt76u_tx_tasklet(unsigned long data) if (dev->drv->tx_status_data && !test_and_set_bit(MT76_READING_STATS, &dev->phy.state)) - queue_work(dev->usb.stat_wq, &dev->usb.stat_work); + queue_work(dev->usb.wq, &dev->usb.stat_work); if (wake) ieee80211_wake_queue(dev->hw, i); } @@ -878,7 +878,7 @@ static void mt76u_tx_status_data(struct work_struct *work) } if (count && test_bit(MT76_STATE_RUNNING, &dev->phy.state)) - queue_work(usb->stat_wq, &usb->stat_work); + queue_work(usb->wq, &usb->stat_work); else clear_bit(MT76_READING_STATS, &dev->phy.state); } @@ -1132,9 +1132,9 @@ static const struct mt76_queue_ops usb_queue_ops = { void mt76u_deinit(struct mt76_dev *dev) { - if (dev->usb.stat_wq) { - destroy_workqueue(dev->usb.stat_wq); - dev->usb.stat_wq = NULL; + if (dev->usb.wq) { + destroy_workqueue(dev->usb.wq); + dev->usb.wq = NULL; } } EXPORT_SYMBOL_GPL(mt76u_deinit); @@ -1160,8 +1160,8 @@ int mt76u_init(struct mt76_dev *dev, tasklet_init(&dev->tx_tasklet, mt76u_tx_tasklet, (unsigned long)dev); INIT_WORK(&usb->stat_work, mt76u_tx_status_data); - usb->stat_wq = alloc_workqueue("mt76u", WQ_UNBOUND, 0); - if (!usb->stat_wq) + usb->wq = alloc_workqueue("mt76u", WQ_UNBOUND, 0); + if (!usb->wq) return -ENOMEM; usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0), 1); |