mt76x0: pci: add mt76x0_register_device in mt76x0e_register_device

Run mt76x0_register_device routine in mt76x0e_register_device
in order to register the device to the mac80211 layer.
Moreover init mt76_driver_ops data structure and register
interrupt line

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index ab91a22b4f0537695da5bb18164e1e6ef14f0395..10845f37af3792eb0ea981db59c35f459783b97d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -127,12 +127,25 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev)
        mt76_clear(dev, 0x110, BIT(9));
        mt76_set(dev, MT_MAX_LEN_CFG, BIT(13));
 
+       err = mt76x0_register_device(dev);
+       if (err < 0)
+               return err;
+
+       set_bit(MT76_STATE_INITIALIZED, &dev->mt76.state);
+
        return 0;
 }
 
 static int
 mt76x0e_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),
+               .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,
+       };
        struct mt76x02_dev *dev;
        int ret;
 
@@ -150,7 +163,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (ret)
                return ret;
 
-       dev = mt76x0_alloc_device(&pdev->dev, NULL, &mt76x0e_ops);
+       dev = mt76x0_alloc_device(&pdev->dev, &drv_ops, &mt76x0e_ops);
        if (!dev)
                return -ENOMEM;
 
@@ -159,6 +172,11 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);
        dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);
 
+       ret = devm_request_irq(dev->mt76.dev, pdev->irq, mt76x02_irq_handler,
+                              IRQF_SHARED, KBUILD_MODNAME, dev);
+       if (ret)
+               goto error;
+
        ret = mt76x0e_register_device(dev);
        if (ret < 0)
                goto error;