net: stmmac: dwmac-loongson: Drop pci_enable/disable_msi calls

The Loongson GMAC driver currently doesn't utilize the MSI IRQs, but
retrieves the IRQs specified in the device DT-node. Let's drop the
direct pci_enable_msi()/pci_disable_msi() calls then as redundant

Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn>
Signed-off-by: Yinggang Gu <guyinggang@loongson.cn>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Acked-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
Tested-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index 9dbd1176636450014f0d7ed3e245e5b0db76c95f..32814afdf321605d9e7a7330cf663f7640a0b269 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -114,7 +114,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
        pci_set_master(pdev);
 
        loongson_default_data(plat);
-       pci_enable_msi(pdev);
        memset(&res, 0, sizeof(res));
        res.addr = pcim_iomap_table(pdev)[0];
 
@@ -122,7 +121,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
        if (res.irq < 0) {
                dev_err(&pdev->dev, "IRQ macirq not found\n");
                ret = -ENODEV;
-               goto err_disable_msi;
+               goto err_disable_device;
        }
 
        res.wol_irq = of_irq_get_byname(np, "eth_wake_irq");
@@ -135,17 +134,15 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
        if (res.lpi_irq < 0) {
                dev_err(&pdev->dev, "IRQ eth_lpi not found\n");
                ret = -ENODEV;
-               goto err_disable_msi;
+               goto err_disable_device;
        }
 
        ret = stmmac_dvr_probe(&pdev->dev, plat, &res);
        if (ret)
-               goto err_disable_msi;
+               goto err_disable_device;
 
        return ret;
 
-err_disable_msi:
-       pci_disable_msi(pdev);
 err_disable_device:
        pci_disable_device(pdev);
 err_put_node:
@@ -169,7 +166,6 @@ static void loongson_dwmac_remove(struct pci_dev *pdev)
                break;
        }
 
-       pci_disable_msi(pdev);
        pci_disable_device(pdev);
 }