USB: automatically enable wakeup for PCI host controllers

This patch (as1193b) enables wakeup during initialization for all PCI
host controllers, and it removes some code (and comments!) that are no
longer needed now that the PCI core automatically initializes wakeup
settings for all new devices.

The idea is that the bus should initialize wakeup, and the bus glue
or controller driver should enable it.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 8aa3f4556a32..65a9609f4ad6 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -589,13 +589,15 @@ static int ohci_run (struct ohci_hcd *ohci)
                 /* also: power/overcurrent flags in roothub.a */
         }
 
-        /* Reset USB nearly "by the book".  RemoteWakeupConnected was
-         * saved if boot firmware (BIOS/SMM/...) told us it's connected,
-         * or if bus glue did the same (e.g. for PCI add-in cards with
-         * PCI PM support).
+        /* Reset USB nearly "by the book".  RemoteWakeupConnected has
+         * to be checked in case boot firmware (BIOS/SMM/...) has set up
+         * wakeup in a way the bus isn't aware of (e.g., legacy PCI PM).
+         * If the bus glue detected wakeup capability then it should
+         * already be enabled.  Either way, if wakeup should be enabled
+         * but isn't, we'll enable it now.
          */
         if ((ohci->hc_control & OHCI_CTRL_RWC) != 0
-                        && !device_may_wakeup(hcd->self.controller))
+                        && !device_can_wakeup(hcd->self.controller))
                 device_init_wakeup(hcd->self.controller, 1);
 
         switch (ohci->hc_control & OHCI_CTRL_HCFS) {