diff options
| author | David Brownell <david-b@pacbell.net> | 2005-09-23 09:38:16 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-29 03:47:40 +0400 |
| commit | 5f827ea3c3820cd8e0a1a35e4d275c8b78ee94e1 (patch) | |
| tree | 7bd8a0f12f83c219cab6da7e30e8d0e1d94df57d /drivers/usb/core/hcd.h | |
| parent | f3f3253d644d36a2ea5464005a9c2cf28804d200 (diff) | |
| download | linux-5f827ea3c3820cd8e0a1a35e4d275c8b78ee94e1.tar.xz | |
[PATCH] usbcore PCI glue updates for PM
This updates the PCI glue to address the new and simplified usbcore suspend
semantics, where CONFIG_USB_SUSPEND becomes irrelevant to HCDs because
hcd->hub_suspend() will always be called.
- Removes now-unneeded recursion support
- Go back to ignoring faults reported by the wakeup calls; we expect them
to fail sometimes, and that's just fine.
The PCI HCDs will need simple changes to catch up to this, like being able
to ignore the setting of CONFIG_USB_SUSPEND.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/core/hcd-pci.c | 106 +++++++++++++++++++++------------------------
drivers/usb/core/hcd.h | 6 +-
2 files changed, 53 insertions(+), 59 deletions(-)
Diffstat (limited to 'drivers/usb/core/hcd.h')
| -rw-r--r-- | drivers/usb/core/hcd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h index eb21f13c5c74..74757fc1a99f 100644 --- a/drivers/usb/core/hcd.h +++ b/drivers/usb/core/hcd.h @@ -182,12 +182,12 @@ struct hc_driver { int (*start) (struct usb_hcd *hcd); /* NOTE: these suspend/resume calls relate to the HC as - * a whole, not just the root hub; they're for bus glue. + * a whole, not just the root hub; they're for PCI bus glue. */ - /* called after all devices were suspended */ + /* called after suspending the hub, before entering D3 etc */ int (*suspend) (struct usb_hcd *hcd, pm_message_t message); - /* called before any devices get resumed */ + /* called after entering D0 (etc), before resuming the hub */ int (*resume) (struct usb_hcd *hcd); /* cleanly make HCD stop writing memory and doing I/O */ |