diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igb')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index a2d72a87cbde..1d684935b4fe 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -186,11 +186,9 @@ static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs); | |||
186 | static int igb_suspend(struct device *); | 186 | static int igb_suspend(struct device *); |
187 | #endif | 187 | #endif |
188 | static int igb_resume(struct device *); | 188 | static int igb_resume(struct device *); |
189 | #ifdef CONFIG_PM_RUNTIME | ||
190 | static int igb_runtime_suspend(struct device *dev); | 189 | static int igb_runtime_suspend(struct device *dev); |
191 | static int igb_runtime_resume(struct device *dev); | 190 | static int igb_runtime_resume(struct device *dev); |
192 | static int igb_runtime_idle(struct device *dev); | 191 | static int igb_runtime_idle(struct device *dev); |
193 | #endif | ||
194 | static const struct dev_pm_ops igb_pm_ops = { | 192 | static const struct dev_pm_ops igb_pm_ops = { |
195 | SET_SYSTEM_SLEEP_PM_OPS(igb_suspend, igb_resume) | 193 | SET_SYSTEM_SLEEP_PM_OPS(igb_suspend, igb_resume) |
196 | SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume, | 194 | SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume, |
@@ -7441,7 +7439,6 @@ static int igb_resume(struct device *dev) | |||
7441 | return 0; | 7439 | return 0; |
7442 | } | 7440 | } |
7443 | 7441 | ||
7444 | #ifdef CONFIG_PM_RUNTIME | ||
7445 | static int igb_runtime_idle(struct device *dev) | 7442 | static int igb_runtime_idle(struct device *dev) |
7446 | { | 7443 | { |
7447 | struct pci_dev *pdev = to_pci_dev(dev); | 7444 | struct pci_dev *pdev = to_pci_dev(dev); |
@@ -7478,8 +7475,7 @@ static int igb_runtime_resume(struct device *dev) | |||
7478 | { | 7475 | { |
7479 | return igb_resume(dev); | 7476 | return igb_resume(dev); |
7480 | } | 7477 | } |
7481 | #endif /* CONFIG_PM_RUNTIME */ | 7478 | #endif /* CONFIG_PM */ |
7482 | #endif | ||
7483 | 7479 | ||
7484 | static void igb_shutdown(struct pci_dev *pdev) | 7480 | static void igb_shutdown(struct pci_dev *pdev) |
7485 | { | 7481 | { |