forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

e1000e / igb / PM: Eliminate CONFIG_PM_RUNTIME

Browse source 
After commit b2b49ccbdd (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>
This commit is contained in:
Rafael J. Wysocki 2014-12-05 03:06:53 +01:00
commit d61c81cb68
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ethernet/intel/e1000e/netdev.c
View file

@ -6372,7 +6372,6 @@ static int e1000e_pm_resume(struct device *dev)
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_PM_RUNTIME
static int e1000e_pm_runtime_idle(struct device *dev) static int e1000e_pm_runtime_idle(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
@ -6432,7 +6431,6 @@ static int e1000e_pm_runtime_suspend(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM_RUNTIME */
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static void e1000_shutdown(struct pci_dev *pdev) static void e1000_shutdown(struct pci_dev *pdev)

6
drivers/net/ethernet/intel/igb/igb_main.c
View file

@ -186,11 +186,9 @@ static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs);
static int igb_suspend(struct device *); static int igb_suspend(struct device *);
#endif #endif
static int igb_resume(struct device *); static int igb_resume(struct device *);
#ifdef CONFIG_PM_RUNTIME
static int igb_runtime_suspend(struct device *dev); static int igb_runtime_suspend(struct device *dev);
static int igb_runtime_resume(struct device *dev); static int igb_runtime_resume(struct device *dev);
static int igb_runtime_idle(struct device *dev); static int igb_runtime_idle(struct device *dev);
#endif
static const struct dev_pm_ops igb_pm_ops = { static const struct dev_pm_ops igb_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(igb_suspend, igb_resume) SET_SYSTEM_SLEEP_PM_OPS(igb_suspend, igb_resume)
SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume, SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume,
@ -7441,7 +7439,6 @@ static int igb_resume(struct device *dev)
return 0; return 0;
} }
#ifdef CONFIG_PM_RUNTIME
static int igb_runtime_idle(struct device *dev) static int igb_runtime_idle(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
@ -7478,8 +7475,7 @@ static int igb_runtime_resume(struct device *dev)
{ {
return igb_resume(dev); return igb_resume(dev);
} }
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
#endif
static void igb_shutdown(struct pci_dev *pdev) static void igb_shutdown(struct pci_dev *pdev)
{ {