diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-10-07 21:52:51 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 16:08:23 (GMT) |
| commit | f247be5d6b5bf5378a9cfec2e315b1ae913f8f0d (patch) | |
| tree | 56374b082480fcf1f65dd3451ecb09031158fdf0 | |
| parent | a75fc17aaa52d4fa7a6bc619a094e542beafac3e (diff) | |
| download | linux-fsl-qoriq-f247be5d6b5bf5378a9cfec2e315b1ae913f8f0d.tar.xz | |
staging: et131x: Move pm calls from pci device to driver device
Move the pci driver suspend/resume calls up to the driver.pm ops
structure, as they are not pci device specific.
Thanks to Francois Romieu <romieu@fr.zoreil.com> for pointing this out.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 95a1aff..2f03ba0 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -870,26 +870,27 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev) pci_disable_device(pdev); } -static int et131x_pci_suspend(struct pci_dev *pdev, pm_message_t state) +#ifdef CONFIG_PM_SLEEP +static int et131x_suspend(struct device *dev) { + struct pci_dev *pdev = to_pci_dev(dev); struct net_device *netdev = pci_get_drvdata(pdev); if (netif_running(netdev)) { netif_device_detach(netdev); et131x_down(netdev); pci_save_state(pdev); - pci_set_power_state(pdev, pci_choose_state(pdev, state)); } return 0; } -static int et131x_pci_resume(struct pci_dev *pdev) +static int et131x_resume(struct device *dev) { + struct pci_dev *pdev = to_pci_dev(dev); struct net_device *netdev = pci_get_drvdata(pdev); if (netif_running(netdev)) { - pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); et131x_up(netdev); netif_device_attach(netdev); @@ -898,6 +899,12 @@ static int et131x_pci_resume(struct pci_dev *pdev) return 0; } +static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume); +#define ET131X_PM_OPS (&et131x_pm_ops) +#else +#define ET131X_PM_OPS NULL +#endif + static struct pci_device_id et131x_pci_table[] __devinitdata = { {ET131X_PCI_VENDOR_ID, ET131X_PCI_DEVICE_ID_GIG, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL}, @@ -913,10 +920,7 @@ static struct pci_driver et131x_driver = { .id_table = et131x_pci_table, .probe = et131x_pci_setup, .remove = __devexit_p(et131x_pci_remove), -#ifdef CONFIG_PM - .suspend = et131x_pci_suspend, - .resume = et131x_pci_resume, -#endif + .driver.pm = ET131X_PM_OPS, }; /** |