Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72f72dcc authored by Kevin Hao's avatar Kevin Hao Committed by David S. Miller
Browse files

e1000e: fix the build error when PM is disabled 



The commit 28002099 (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: default avatarKevin Hao <haokexin@gmail.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 406d4965

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −0
Original line number Diff line number Diff line
@@ -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)

};