diff options
| author | Andy Gospodarek <andy@greyhouse.net> | 2009-07-22 05:34:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 14:05:32 -0400 |
| commit | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (patch) | |
| tree | 023c7a146714980a945f9ad214983e5da9bc41b7 | |
| parent | 601278659d5717b4f7a14fbc9f2b9d559bba6aef (diff) | |
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.c | 1 |
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, | |||
| 5640 | adapter->wol = 0; | 5640 | adapter->wol = 0; |
| 5641 | break; | 5641 | break; |
| 5642 | } | 5642 | } |
| 5643 | device_init_wakeup(&adapter->pdev->dev, true); | ||
| 5644 | device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); | 5643 | device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); |
| 5645 | 5644 | ||
| 5646 | /* pick up the PCI bus settings for reporting later */ | 5645 | /* pick up the PCI bus settings for reporting later */ |