summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Gospodarek <andy@greyhouse.net>2009-07-22 11:34:00 +0200
committerDavid S. Miller <davem@davemloft.net>2009-07-23 20:05:32 +0200
commitffafa60d496f80c250f2ae0340ae94434c0b0b4d (patch)
tree023c7a146714980a945f9ad214983e5da9bc41b7
parentixgbe: Don't priority tag control frames in DCB mode (diff)
downloadlinux-ffafa60d496f80c250f2ae0340ae94434c0b0b4d.tar.xz
linux-ffafa60d496f80c250f2ae0340ae94434c0b0b4d.zip
ixgbe: remove unnecessary call to device_init_wakeup
Calls to device_init_wakeup should not be necessary in drivers that use device_set_wakeup_enable since pci_pm_init will set the can_wakeup flag for the device when initialized. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 47a3c6d70569..68877599f6db 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -5640,7 +5640,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
adapter->wol = 0;
break;
}
- device_init_wakeup(&adapter->pdev->dev, true);
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
/* pick up the PCI bus settings for reporting later */