[PATCH net-next] e1000e: fix the build error when PM is disabled

[PATCH net-next] e1000e: fix the build error when PM is disabled

[Kevin Hao]

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(+)

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)
 };
-- 
1.8.5.3

Re: [PATCH net-next] e1000e: fix the build error when PM is disabled

[Jeff Kirsher]

[-- Attachment #1.1: Type: text/plain, Size: 992 bytes --]

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.

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 370 bytes --]

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech

[-- Attachment #3: Type: text/plain, Size: 257 bytes --]

_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired