1 files changed, 20 insertions, 6 deletions

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
index 92432fe97312..6274655e1f7e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
@@ -30,7 +30,19 @@ static const struct pci_device_id mt76pci_device_table[] = {
 static int
 mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
+        static const struct mt76_driver_ops drv_ops = {
+                .txwi_size = sizeof(struct mt76x02_txwi),
+                .update_survey = mt76x02_update_channel,
+                .tx_prepare_skb = mt76x02_tx_prepare_skb,
+                .tx_complete_skb = mt76x02_tx_complete_skb,
+                .rx_skb = mt76x02_queue_rx_skb,
+                .rx_poll_complete = mt76x02_rx_poll_complete,
+                .sta_ps = mt76x02_sta_ps,
+                .sta_add = mt76x02_sta_add,
+                .sta_remove = mt76x02_sta_remove,
+        };
         struct mt76x02_dev *dev;
+        struct mt76_dev *mdev;
         int ret;
 
         ret = pcim_enable_device(pdev);
@@ -47,17 +59,19 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if (ret)
                 return ret;
 
-        dev = mt76x2_alloc_device(&pdev->dev);
-        if (!dev)
+        mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt76x2_ops,
+                                 &drv_ops);
+        if (!mdev)
                 return -ENOMEM;
 
-        mt76_mmio_init(&dev->mt76, pcim_iomap_table(pdev)[0]);
+        dev = container_of(mdev, struct mt76x02_dev, mt76);
+        mt76_mmio_init(mdev, pcim_iomap_table(pdev)[0]);
         mt76x2_reset_wlan(dev, false);
 
-        dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);
-        dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);
+        mdev->rev = mt76_rr(dev, MT_ASIC_VERSION);
+        dev_info(mdev->dev, "ASIC revision: %08x\n", mdev->rev);
 
-        ret = devm_request_irq(dev->mt76.dev, pdev->irq, mt76x02_irq_handler,
+        ret = devm_request_irq(mdev->dev, pdev->irq, mt76x02_irq_handler,
                                IRQF_SHARED, KBUILD_MODNAME, dev);
         if (ret)
                 goto error;