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>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 3809d9afdcee32f27b8c63bf0fe5f336262783a3..002e142ca893009a8995ea64ddb206887e38d545 100644 (file)
--- 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 981d8a985557aea48b4cd892ed1a7444eb9d7da5..3aa1425049d9893679f4da03ee26f08ee86cd8e2 100644 (file)
--- 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);