diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index c30d41d6e426..6d14eea17918 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
| @@ -6174,7 +6174,7 @@ static int __e1000_resume(struct pci_dev *pdev) | |||
| 6174 | return 0; | 6174 | return 0; |
| 6175 | } | 6175 | } |
| 6176 | 6176 | ||
| 6177 | #ifdef CONFIG_PM | 6177 | #ifdef CONFIG_PM_SLEEP |
| 6178 | static int e1000_suspend(struct device *dev) | 6178 | static int e1000_suspend(struct device *dev) |
| 6179 | { | 6179 | { |
| 6180 | struct pci_dev *pdev = to_pci_dev(dev); | 6180 | struct pci_dev *pdev = to_pci_dev(dev); |
| @@ -6193,7 +6193,7 @@ static int e1000_resume(struct device *dev) | |||
| 6193 | 6193 | ||
| 6194 | return __e1000_resume(pdev); | 6194 | return __e1000_resume(pdev); |
| 6195 | } | 6195 | } |
| 6196 | #endif /* CONFIG_PM */ | 6196 | #endif /* CONFIG_PM_SLEEP */ |
| 6197 | 6197 | ||
| 6198 | #ifdef CONFIG_PM_RUNTIME | 6198 | #ifdef CONFIG_PM_RUNTIME |
| 6199 | static int e1000_runtime_suspend(struct device *dev) | 6199 | static int e1000_runtime_suspend(struct device *dev) |
| @@ -7015,13 +7015,11 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { | |||
| 7015 | }; | 7015 | }; |
| 7016 | MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); | 7016 | MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); |
| 7017 | 7017 | ||
| 7018 | #ifdef CONFIG_PM | ||
| 7019 | static const struct dev_pm_ops e1000_pm_ops = { | 7018 | static const struct dev_pm_ops e1000_pm_ops = { |
| 7020 | SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume) | 7019 | SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume) |
| 7021 | SET_RUNTIME_PM_OPS(e1000_runtime_suspend, e1000_runtime_resume, | 7020 | SET_RUNTIME_PM_OPS(e1000_runtime_suspend, e1000_runtime_resume, |
| 7022 | e1000_idle) | 7021 | e1000_idle) |
| 7023 | }; | 7022 | }; |
| 7024 | #endif | ||
| 7025 | 7023 | ||
| 7026 | /* PCI Device API Driver */ | 7024 | /* PCI Device API Driver */ |
| 7027 | static struct pci_driver e1000_driver = { | 7025 | static struct pci_driver e1000_driver = { |
| @@ -7029,11 +7027,9 @@ static struct pci_driver e1000_driver = { | |||
| 7029 | .id_table = e1000_pci_tbl, | 7027 | .id_table = e1000_pci_tbl, |
| 7030 | .probe = e1000_probe, | 7028 | .probe = e1000_probe, |
| 7031 | .remove = e1000_remove, | 7029 | .remove = e1000_remove, |
| 7032 | #ifdef CONFIG_PM | ||
| 7033 | .driver = { | 7030 | .driver = { |
| 7034 | .pm = &e1000_pm_ops, | 7031 | .pm = &e1000_pm_ops, |
| 7035 | }, | 7032 | }, |
| 7036 | #endif | ||
| 7037 | .shutdown = e1000_shutdown, | 7033 | .shutdown = e1000_shutdown, |
| 7038 | .err_handler = &e1000_err_handler | 7034 | .err_handler = &e1000_err_handler |
| 7039 | }; | 7035 | }; |
