Skip to content

Commit 52c1f79

Browse files
andy-shevdavem330
authored andcommitted
stmmac: intel: Convert to use pci_alloc_irq_vectors() API
pci_enable_msi() is deprecated API, thus, switch to modern pci_alloc_irq_vectors(). Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e578f04 commit 52c1f79

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,15 +649,18 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,
649649
if (ret)
650650
return ret;
651651

652-
pci_enable_msi(pdev);
652+
ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
653+
if (ret < 0)
654+
return ret;
653655

654656
memset(&res, 0, sizeof(res));
655657
res.addr = pcim_iomap_table(pdev)[0];
656-
res.wol_irq = pdev->irq;
657-
res.irq = pdev->irq;
658+
res.wol_irq = pci_irq_vector(pdev, 0);
659+
res.irq = pci_irq_vector(pdev, 0);
658660

659661
ret = stmmac_dvr_probe(&pdev->dev, plat, &res);
660662
if (ret) {
663+
pci_free_irq_vectors(pdev);
661664
clk_disable_unprepare(plat->stmmac_clk);
662665
clk_unregister_fixed_rate(plat->stmmac_clk);
663666
}
@@ -679,6 +682,8 @@ static void intel_eth_pci_remove(struct pci_dev *pdev)
679682

680683
stmmac_dvr_remove(&pdev->dev);
681684

685+
pci_free_irq_vectors(pdev);
686+
682687
clk_disable_unprepare(priv->plat->stmmac_clk);
683688
clk_unregister_fixed_rate(priv->plat->stmmac_clk);
684689

0 commit comments

Comments
 (0)