mt76: mt7915: move MT_INT_MASK_CSR to init.c

To avoid redundant MT_INT_MASK_CSR settings.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index 70baad756dd028010cb7fc105d37e9f649a91959..1e777affc2d87f969b918b7b4e2f56e6451eb414 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -652,6 +652,7 @@ mt7915_init_hardware(struct mt7915_dev *dev, struct mt7915_phy *phy2)
 {
        int ret, idx;
 
+       mt76_wr(dev, MT_INT_MASK_CSR, 0);
        mt76_wr(dev, MT_INT_SOURCE_CSR, ~0);
 
        INIT_WORK(&dev->init_work, mt7915_init_work);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
index 229d40826c9b743fa4a177ae59faa61824678b5a..3c55d4cebbf2e9026eedc4b9d29c177e73d2cfb2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c
@@ -668,8 +668,6 @@ struct mt7915_dev *mt7915_mmio_probe(struct device *pdev,
 
        tasklet_setup(&dev->irq_tasklet, mt7915_irq_tasklet);
 
-       mt76_wr(dev, MT_INT_MASK_CSR, 0);
-
        return dev;
 
 error:

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
index 1bab1cbb0d89647ee3ac4d71903400213991d6da..7cea49f23941a0a24462b0653b68c7c7bb5c6406 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/pci.c
@@ -139,8 +139,6 @@ static int mt7915_pci_probe(struct pci_dev *pdev,
        if (ret)
                goto free_irq_vector;
 
-       mt76_wr(dev, MT_INT_MASK_CSR, 0);
-
        /* master switch of PCIe tnterrupt enable */
        mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
index c1900646c54dde0dfe33319ba53f6b1ddc6988f6..c74afa746251b6b83b32bf7d8d772451574173fb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
@@ -1197,7 +1197,6 @@ static int mt7986_wmac_probe(struct platform_device *pdev)
                goto free_irq;
 
        mt7915_wfsys_reset(dev);
-       mt76_wr(dev, MT_INT_MASK_CSR, 0);
 
        ret = mt7915_register_device(dev);
        if (ret)