leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stmmac: intel: use managed PCI function on probe and resume

Browse Source 
Update dwmac-intel to use managed function, i.e. pcim_enable_device().

This will allow devres framework to call resource free function for us.

Signed-off-by: Wong Vee Khee <vee.khee.wong@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wong Vee Khee 2021-04-01 14:02:50 +08:00 committed by David S. Miller
parent b7a320c3a1
commit 8accc46775
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
View File

@ -924,7 +924,7 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,
return -ENOMEM; return -ENOMEM;
/* Enable pci device */ /* Enable pci device */
ret = pci_enable_device(pdev); ret = pcim_enable_device(pdev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "%s: ERROR: failed to enable device\n", dev_err(&pdev->dev, "%s: ERROR: failed to enable device\n",
__func__); __func__);
@ -1006,13 +1006,9 @@ static void intel_eth_pci_remove(struct pci_dev *pdev)
stmmac_dvr_remove(&pdev->dev); stmmac_dvr_remove(&pdev->dev);
pci_free_irq_vectors(pdev);
clk_unregister_fixed_rate(priv->plat->stmmac_clk); clk_unregister_fixed_rate(priv->plat->stmmac_clk);
pcim_iounmap_regions(pdev, BIT(0)); pcim_iounmap_regions(pdev, BIT(0));
pci_disable_device(pdev);
} }
static int __maybe_unused intel_eth_pci_suspend(struct device *dev) static int __maybe_unused intel_eth_pci_suspend(struct device *dev)
@ -1028,7 +1024,6 @@ static int __maybe_unused intel_eth_pci_suspend(struct device *dev)
if (ret) if (ret)
return ret; return ret;
pci_disable_device(pdev);
pci_wake_from_d3(pdev, true); pci_wake_from_d3(pdev, true);
return 0; return 0;
} }
@ -1041,7 +1036,7 @@ static int __maybe_unused intel_eth_pci_resume(struct device *dev)
pci_restore_state(pdev); pci_restore_state(pdev);
pci_set_power_state(pdev, PCI_D0); pci_set_power_state(pdev, PCI_D0);
ret = pci_enable_device(pdev); ret = pcim_enable_device(pdev);
if (ret) if (ret)
return ret; return ret;