]> Pileus Git - ~andy/linux/commitdiff
atl1: Protect atl1_suspend with CONFIG_PM_SLEEP
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 16 Apr 2013 21:35:00 +0000 (18:35 -0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Apr 2013 21:46:24 +0000 (17:46 -0400)
commit 7b7a2bbb690 (atl1: Remove unneeded PM_OPS definitions) removed the
definition of atl1_suspend for the !CONFIG_PM_SLEEP case.

So only call atl1_suspend() when CONFIG_PM_SLEEP is defined and fix the
following build error from randconfig:

drivers/net/ethernet/atheros/atlx/atl1.c: In function 'atl1_shutdown':
drivers/net/ethernet/atheros/atlx/atl1.c:2888:2: error: implicit declaration of function 'atl1_suspend' [-Werror=implicit-function-declaration]

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/atheros/atlx/atl1.c

index 9843c7059b6cbe4a959d78dbd84e8c43a77a2f9c..8338013ab33d9db1ec4af80631c2e5b24b31dc7e 100644 (file)
@@ -2885,7 +2885,9 @@ static void atl1_shutdown(struct pci_dev *pdev)
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct atl1_adapter *adapter = netdev_priv(netdev);
 
+#ifdef CONFIG_PM_SLEEP
        atl1_suspend(&pdev->dev);
+#endif
        pci_wake_from_d3(pdev, adapter->wol);
        pci_set_power_state(pdev, PCI_D3hot);
 }