| Message ID | 1394780233-8066-1-git-send-email-haokexin@gmail.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2014-03-14 at 14:57 +0800, Kevin Hao wrote: > The commit 2800209994f8 (e1000e: Refactor PM flows) changed the > SET_SYSTEM_SLEEP_PM_OPS to open-coded assignment, but forgot to > protect them with CONFIG_PM_SLEEP. Then cause the following build > error when PM is disabled: > drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: > error: 'e1000e_pm_suspend' undeclared here (not in a function) > .suspend = e1000e_pm_suspend, > ^ > drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: > error: 'e1000e_pm_resume' undeclared here (not in a function) > .resume = e1000e_pm_resume, > ^ > drivers/net/ethernet/intel/e1000e/netdev.c:7082:11: > error: 'e1000e_pm_thaw' undeclared here (not in a function) > .thaw = e1000e_pm_thaw, > ^ > > Signed-off-by: Kevin Hao <haokexin@gmail.com> > --- > drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ > 1 file changed, 2 insertions(+) Thanks Kevin, I will add this to my queue.
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 3f044e736de8..eafad410e59a 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7076,12 +7076,14 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); static const struct dev_pm_ops e1000_pm_ops = { +#ifdef CONFIG_PM_SLEEP .suspend = e1000e_pm_suspend, .resume = e1000e_pm_resume, .freeze = e1000e_pm_freeze, .thaw = e1000e_pm_thaw, .poweroff = e1000e_pm_suspend, .restore = e1000e_pm_resume, +#endif SET_RUNTIME_PM_OPS(e1000e_pm_runtime_suspend, e1000e_pm_runtime_resume, e1000e_pm_runtime_idle) };
The commit 2800209994f8 (e1000e: Refactor PM flows) changed the SET_SYSTEM_SLEEP_PM_OPS to open-coded assignment, but forgot to protect them with CONFIG_PM_SLEEP. Then cause the following build error when PM is disabled: drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: error: 'e1000e_pm_suspend' undeclared here (not in a function) .suspend = e1000e_pm_suspend, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: error: 'e1000e_pm_resume' undeclared here (not in a function) .resume = e1000e_pm_resume, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7082:11: error: 'e1000e_pm_thaw' undeclared here (not in a function) .thaw = e1000e_pm_thaw, ^ Signed-off-by: Kevin Hao <haokexin@gmail.com> --- drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ 1 file changed, 2 insertions(+)