diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2007-06-21 16:25:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-12 19:34:39 -0400 |
commit | e7e6da9eb189dfa221e3bf9c21d58f02adc8983c (patch) | |
tree | d901feb725d196537392bdef1cc8693e936c8847 /drivers/usb/core/hcd.c | |
parent | 317c67b8f7092db325a3df825646eb26982908c6 (diff) |
USB: Remove usages of dev->power.power_state
This patch (as922) removes all but one of the remaining vestiges of
dev->power.power_state from usbcore. The only usage left must remain
until the deprecated "power/state" sysfs attribute is gone.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/hcd.c')
-rw-r--r-- | drivers/usb/core/hcd.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 3df538539b4..5254c50086a 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -965,19 +965,9 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) | |||
965 | else switch (hcd->state) { | 965 | else switch (hcd->state) { |
966 | case HC_STATE_RUNNING: | 966 | case HC_STATE_RUNNING: |
967 | case HC_STATE_RESUMING: | 967 | case HC_STATE_RESUMING: |
968 | doit: | ||
969 | list_add_tail (&urb->urb_list, &ep->urb_list); | 968 | list_add_tail (&urb->urb_list, &ep->urb_list); |
970 | status = 0; | 969 | status = 0; |
971 | break; | 970 | break; |
972 | case HC_STATE_SUSPENDED: | ||
973 | /* HC upstream links (register access, wakeup signaling) can work | ||
974 | * even when the downstream links (and DMA etc) are quiesced; let | ||
975 | * usbcore talk to the root hub. | ||
976 | */ | ||
977 | if (hcd->self.controller->power.power_state.event == PM_EVENT_ON | ||
978 | && urb->dev->parent == NULL) | ||
979 | goto doit; | ||
980 | /* FALL THROUGH */ | ||
981 | default: | 971 | default: |
982 | status = -ESHUTDOWN; | 972 | status = -ESHUTDOWN; |
983 | break; | 973 | break; |