f197b2c54b
This simplifies the OHCI root hub suspend logic: - Uses new usbcore root hub calls to make autosuspend work again: * Uses a newish usbcore root hub wakeup mechanism, making requests to khubd not keventd. * Uses an even newer sibling suspend hook. - Expect someone always made usbcore call ohci_hub_suspend() before bus glue fires; and that ohci_hub_resume() is only called after that bus glue ran. Previously, only CONFIG_USB_SUSPEND promised those things. (Includes updates to PCI and OMAP bus glue.) - Handle a not-noticed-before special case during resume from one of the swsusp snapshots when using "usb-handoff": the controller isn't left in RESET state. (A bug to fix in the usb-handoff code...) Also cleans up a minor debug printk glitch, and switches an mdelay over to an msleep (how did that stick around for so long?). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/host/ohci-dbg.c | 4 ---- drivers/usb/host/ohci-hcd.c | 2 +- drivers/usb/host/ohci-hub.c | 42 ++++++++++++------------------------------ drivers/usb/host/ohci-mem.c | 1 - drivers/usb/host/ohci-omap.c | 36 ++++++++++++------------------------ drivers/usb/host/ohci-pci.c | 40 ++++++++-------------------------------- drivers/usb/host/ohci.h | 1 - 7 files changed, 33 insertions(+), 93 deletions(-) |
||
|---|---|---|
| .. | ||
| ehci-dbg.c | ||
| ehci-hcd.c | ||
| ehci-hub.c | ||
| ehci-mem.c | ||
| ehci-pci.c | ||
| ehci-q.c | ||
| ehci-sched.c | ||
| ehci.h | ||
| hc_crisv10.c | ||
| hc_crisv10.h | ||
| isp116x-hcd.c | ||
| isp116x.h | ||
| Kconfig | ||
| Makefile | ||
| ohci-au1xxx.c | ||
| ohci-dbg.c | ||
| ohci-hcd.c | ||
| ohci-hub.c | ||
| ohci-lh7a404.c | ||
| ohci-mem.c | ||
| ohci-omap.c | ||
| ohci-pci.c | ||
| ohci-ppc-soc.c | ||
| ohci-pxa27x.c | ||
| ohci-q.c | ||
| ohci-s3c2410.c | ||
| ohci-sa1111.c | ||
| ohci.h | ||
| pci-quirks.c | ||
| sl811_cs.c | ||
| sl811-hcd.c | ||
| sl811.h | ||
| uhci-debug.c | ||
| uhci-hcd.c | ||
| uhci-hcd.h | ||
| uhci-hub.c | ||
| uhci-q.c | ||