Commit 33b7a252 authored by Vaibhav Gupta's avatar Vaibhav Gupta Committed by David S. Miller

ne2k-pci: use generic power management

With legacy PM, drivers themselves were responsible for managing the
device's power states and takes care of register states.

After upgrading to the generic structure, PCI core will take care of
required tasks and drivers should do only device-specific operations.

Thus, there is no need to call the PCI helper functions like
pci_enable/disable_device(), pci_save/restore_sate() and
pci_set_power_state().

Compile-tested only.
Signed-off-by: default avatarVaibhav Gupta <vaibhavgupta40@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b46681c
...@@ -699,30 +699,18 @@ static void ne2k_pci_remove_one(struct pci_dev *pdev) ...@@ -699,30 +699,18 @@ static void ne2k_pci_remove_one(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
#ifdef CONFIG_PM static int __maybe_unused ne2k_pci_suspend(struct device *dev_d)
static int ne2k_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = dev_get_drvdata(dev_d);
netif_device_detach(dev); netif_device_detach(dev);
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, pci_choose_state(pdev, state));
return 0; return 0;
} }
static int ne2k_pci_resume(struct pci_dev *pdev) static int __maybe_unused ne2k_pci_resume(struct device *dev_d)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = dev_get_drvdata(dev_d);
int rc;
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
rc = pci_enable_device(pdev);
if (rc)
return rc;
NS8390_init(dev, 1); NS8390_init(dev, 1);
netif_device_attach(dev); netif_device_attach(dev);
...@@ -730,19 +718,14 @@ static int ne2k_pci_resume(struct pci_dev *pdev) ...@@ -730,19 +718,14 @@ static int ne2k_pci_resume(struct pci_dev *pdev)
return 0; return 0;
} }
#endif /* CONFIG_PM */ static SIMPLE_DEV_PM_OPS(ne2k_pci_pm_ops, ne2k_pci_suspend, ne2k_pci_resume);
static struct pci_driver ne2k_driver = { static struct pci_driver ne2k_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.probe = ne2k_pci_init_one, .probe = ne2k_pci_init_one,
.remove = ne2k_pci_remove_one, .remove = ne2k_pci_remove_one,
.id_table = ne2k_pci_tbl, .id_table = ne2k_pci_tbl,
#ifdef CONFIG_PM .driver.pm = &ne2k_pci_pm_ops,
.suspend = ne2k_pci_suspend,
.resume = ne2k_pci_resume,
#endif
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment