[PATCH] skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEP

[PATCH] skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEP

[Daniel Halperin]

drivers/net/ethernet/marvell/skge.c:4046: warning: ‘skge_suspend’ defined but not used
drivers/net/ethernet/marvell/skge.c:4071: warning: ‘skge_resume’ defined but not used

Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
---
 drivers/net/ethernet/marvell/skge.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index dea0cb4..e6a007a 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -4042,7 +4042,7 @@ static void __devexit skge_remove(struct pci_dev *pdev)
 	pci_set_drvdata(pdev, NULL);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int skge_suspend(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
@@ -4104,7 +4104,7 @@ static SIMPLE_DEV_PM_OPS(skge_pm_ops, skge_suspend, skge_resume);
 #else
 
 #define SKGE_PM_OPS NULL
-#endif
+#endif /* CONFIG_PM_SLEEP */
 
 static void skge_shutdown(struct pci_dev *pdev)
 {
-- 
1.7.0.4

Re: [PATCH] skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEP

[David Miller]

From: Daniel Halperin <dhalperi@cs.washington.edu>
Date: Tue, 3 Jan 2012 09:34:48 -0800

> drivers/net/ethernet/marvell/skge.c:4046: warning: ‘skge_suspend’ defined but not used
> drivers/net/ethernet/marvell/skge.c:4071: warning: ‘skge_resume’ defined but not used
> 
> Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>
> Cc: Stephen Hemminger <shemminger@linux-foundation.org>

Applied to net-next, thanks.