From: Dave Hansen <[email protected]>

I have a .config with CONFIG_PM disabled.  I get the following whenever
compiling the e1000 driver:

...net/ethernet/intel/e1000e/netdev.c:6450:13: warning: 
'e1000e_disable_aspm_locked' defined but not used [-Wunused-function]
 static void e1000e_disable_aspm_locked(struct pci_dev *pdev, u16 state)

Looks like we just need to move e1000e_disable_aspm_locked() to
be underneath the CONFIG_PM #ifdef.

Signed-off-by: Dave Hansen <[email protected]>
Cc: Jeff Kirsher <[email protected]> (supporter:INTEL ETHERNET 
DRIVERS)
Cc: Jesse Brandeburg <[email protected]> (reviewer)
Cc: Shannon Nelson <[email protected]> (reviewer)
Cc: Carolyn Wyborny <[email protected]> (reviewer)
Cc: Don Skidmore <[email protected]> (reviewer)
Cc: Matthew Vick <[email protected]> (reviewer)
Cc: John Ronciak <[email protected]> (reviewer)
Cc: Mitch Williams <[email protected]> (reviewer)
Cc: [email protected] (open list:INTEL ETHERNET DRIVERS)
Cc: [email protected] (open list:NETWORKING DRIVERS)
Cc: [email protected] (open list)
---

 b/drivers/net/ethernet/intel/e1000e/netdev.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/net/ethernet/intel/e1000e/netdev.c~fix-e1000-warning 
drivers/net/ethernet/intel/e1000e/netdev.c
--- a/drivers/net/ethernet/intel/e1000e/netdev.c~fix-e1000-warning      
2015-08-31 14:19:11.520115321 -0700
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c        2015-08-31 
14:19:11.525115549 -0700
@@ -6439,6 +6439,7 @@ static void e1000e_disable_aspm(struct p
        __e1000e_disable_aspm(pdev, state, 0);
 }
 
+#ifdef CONFIG_PM
 /**
  * e1000e_disable_aspm_locked   Disable ASPM states.
  * @pdev: pointer to PCI device struct
@@ -6452,7 +6453,6 @@ static void e1000e_disable_aspm_locked(s
        __e1000e_disable_aspm(pdev, state, 1);
 }
 
-#ifdef CONFIG_PM
 static int __e1000_resume(struct pci_dev *pdev)
 {
        struct net_device *netdev = pci_get_drvdata(pdev);
_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to