Commit 52c1f794 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e578f043

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

+8 −3
Original line number Diff line number Diff line
@@ -649,15 +649,18 @@ static int intel_eth_pci_probe(struct pci_dev *pdev, 
	if (ret)

		return ret;



	pci_enable_msi(pdev);

	ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);

	if (ret < 0)

		return ret;



	memset(&res, 0, sizeof(res));

	res.addr = pcim_iomap_table(pdev)[0];

	res.wol_irq = pdev->irq;

	res.irq = pdev->irq;

	res.wol_irq = pci_irq_vector(pdev, 0);

	res.irq = pci_irq_vector(pdev, 0);



	ret = stmmac_dvr_probe(&pdev->dev, plat, &res);

	if (ret) {

		pci_free_irq_vectors(pdev);

		clk_disable_unprepare(plat->stmmac_clk);

		clk_unregister_fixed_rate(plat->stmmac_clk);

	}
@@ -679,6 +682,8 @@ static void intel_eth_pci_remove(struct pci_dev *pdev) 


	stmmac_dvr_remove(&pdev->dev);



	pci_free_irq_vectors(pdev);



	clk_disable_unprepare(priv->plat->stmmac_clk);

	clk_unregister_fixed_rate(priv->plat->stmmac_clk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE