diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 21:06:53 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-04 21:06:53 -0500 |
commit | d61c81cb68bcdd6bc3cee4fe97c71cab9afd78b6 (patch) | |
tree | e49d99602ce7c813c6a93ddbd1eabd9f8adfdfbc /drivers/net/ethernet/intel/e1000e/netdev.c | |
parent | 162d6f98005fce408efc5af73956c434ae08ef73 (diff) |
e1000e / igb / PM: Eliminate CONFIG_PM_RUNTIME
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME within #ifdef blocks depending on
CONFIG_PM may be dropped now.
Do that in the e1000e and igb network drivers.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 247335d2c7ec..952ef7c434e8 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -6372,7 +6372,6 @@ static int e1000e_pm_resume(struct device *dev) | |||
6372 | } | 6372 | } |
6373 | #endif /* CONFIG_PM_SLEEP */ | 6373 | #endif /* CONFIG_PM_SLEEP */ |
6374 | 6374 | ||
6375 | #ifdef CONFIG_PM_RUNTIME | ||
6376 | static int e1000e_pm_runtime_idle(struct device *dev) | 6375 | static int e1000e_pm_runtime_idle(struct device *dev) |
6377 | { | 6376 | { |
6378 | struct pci_dev *pdev = to_pci_dev(dev); | 6377 | struct pci_dev *pdev = to_pci_dev(dev); |
@@ -6432,7 +6431,6 @@ static int e1000e_pm_runtime_suspend(struct device *dev) | |||
6432 | 6431 | ||
6433 | return 0; | 6432 | return 0; |
6434 | } | 6433 | } |
6435 | #endif /* CONFIG_PM_RUNTIME */ | ||
6436 | #endif /* CONFIG_PM */ | 6434 | #endif /* CONFIG_PM */ |
6437 | 6435 | ||
6438 | static void e1000_shutdown(struct pci_dev *pdev) | 6436 | static void e1000_shutdown(struct pci_dev *pdev) |