aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2010-03-08 16:48:49 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-05-11 15:01:08 -0400
commit52b265a12768b9a72679bec825eb82c784116464 (patch)
tree59affe31ac556631a9012e13f93ea54e43109f2f
parent75568f8094eb0333e9c2109b23cbc8b82d318a3c (diff)
PCI: clearing wakeup flags not needed
This patch (as1353) removes a couple of unnecessary assignments from the PCI core. The should_wakeup flag is naturally initialized to 0; there's no need to clear it. Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r--drivers/pci/pci.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 37499127c801..60fcb6f02c91 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1631,7 +1631,6 @@ void pci_pm_init(struct pci_dev *dev)
1631 * let the user space enable it to wake up the system as needed. 1631 * let the user space enable it to wake up the system as needed.
1632 */ 1632 */
1633 device_set_wakeup_capable(&dev->dev, true); 1633 device_set_wakeup_capable(&dev->dev, true);
1634 device_set_wakeup_enable(&dev->dev, false);
1635 /* Disable the PME# generation functionality */ 1634 /* Disable the PME# generation functionality */
1636 pci_pme_active(dev, false); 1635 pci_pme_active(dev, false);
1637 } else { 1636 } else {
@@ -1655,7 +1654,6 @@ void platform_pci_wakeup_init(struct pci_dev *dev)
1655 return; 1654 return;
1656 1655
1657 device_set_wakeup_capable(&dev->dev, true); 1656 device_set_wakeup_capable(&dev->dev, true);
1658 device_set_wakeup_enable(&dev->dev, false);
1659 platform_pci_sleep_wake(dev, false); 1657 platform_pci_sleep_wake(dev, false);
1660} 1658}
1661 1659