aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/netdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c8
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 d6570b2d5a6b..6d91933c4cdd 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6184,7 +6184,7 @@ static int __e1000_resume(struct pci_dev *pdev)
6184 return 0; 6184 return 0;
6185} 6185}
6186 6186
6187#ifdef CONFIG_PM 6187#ifdef CONFIG_PM_SLEEP
6188static int e1000_suspend(struct device *dev) 6188static int e1000_suspend(struct device *dev)
6189{ 6189{
6190 struct pci_dev *pdev = to_pci_dev(dev); 6190 struct pci_dev *pdev = to_pci_dev(dev);
@@ -6203,7 +6203,7 @@ static int e1000_resume(struct device *dev)
6203 6203
6204 return __e1000_resume(pdev); 6204 return __e1000_resume(pdev);
6205} 6205}
6206#endif /* CONFIG_PM */ 6206#endif /* CONFIG_PM_SLEEP */
6207 6207
6208#ifdef CONFIG_PM_RUNTIME 6208#ifdef CONFIG_PM_RUNTIME
6209static int e1000_runtime_suspend(struct device *dev) 6209static int e1000_runtime_suspend(struct device *dev)
@@ -7025,13 +7025,11 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
7025}; 7025};
7026MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); 7026MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
7027 7027
7028#ifdef CONFIG_PM
7029static const struct dev_pm_ops e1000_pm_ops = { 7028static const struct dev_pm_ops e1000_pm_ops = {
7030 SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume) 7029 SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)
7031 SET_RUNTIME_PM_OPS(e1000_runtime_suspend, e1000_runtime_resume, 7030 SET_RUNTIME_PM_OPS(e1000_runtime_suspend, e1000_runtime_resume,
7032 e1000_idle) 7031 e1000_idle)
7033}; 7032};
7034#endif
7035 7033
7036/* PCI Device API Driver */ 7034/* PCI Device API Driver */
7037static struct pci_driver e1000_driver = { 7035static struct pci_driver e1000_driver = {
@@ -7039,11 +7037,9 @@ static struct pci_driver e1000_driver = {
7039 .id_table = e1000_pci_tbl, 7037 .id_table = e1000_pci_tbl,
7040 .probe = e1000_probe, 7038 .probe = e1000_probe,
7041 .remove = e1000_remove, 7039 .remove = e1000_remove,
7042#ifdef CONFIG_PM
7043 .driver = { 7040 .driver = {
7044 .pm = &e1000_pm_ops, 7041 .pm = &e1000_pm_ops,
7045 }, 7042 },
7046#endif
7047 .shutdown = e1000_shutdown, 7043 .shutdown = e1000_shutdown,
7048 .err_handler = &e1000_err_handler 7044 .err_handler = &e1000_err_handler
7049}; 7045};