mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
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>
This commit is contained in:
parent
317c67b8f7
commit
e7e6da9eb1
2 changed files with 1 additions and 15 deletions
|
@ -1196,11 +1196,7 @@ static int usb_resume_both(struct usb_device *udev)
|
|||
/* We can't progagate beyond the USB subsystem,
|
||||
* so if a root hub's controller is suspended
|
||||
* then we're stuck. */
|
||||
if (udev->dev.parent->power.power_state.event !=
|
||||
PM_EVENT_ON)
|
||||
status = -EHOSTUNREACH;
|
||||
else
|
||||
status = usb_resume_device(udev);
|
||||
status = usb_resume_device(udev);
|
||||
}
|
||||
} else {
|
||||
|
||||
|
|
|
@ -965,19 +965,9 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
|
|||
else switch (hcd->state) {
|
||||
case HC_STATE_RUNNING:
|
||||
case HC_STATE_RESUMING:
|
||||
doit:
|
||||
list_add_tail (&urb->urb_list, &ep->urb_list);
|
||||
status = 0;
|
||||
break;
|
||||
case HC_STATE_SUSPENDED:
|
||||
/* HC upstream links (register access, wakeup signaling) can work
|
||||
* even when the downstream links (and DMA etc) are quiesced; let
|
||||
* usbcore talk to the root hub.
|
||||
*/
|
||||
if (hcd->self.controller->power.power_state.event == PM_EVENT_ON
|
||||
&& urb->dev->parent == NULL)
|
||||
goto doit;
|
||||
/* FALL THROUGH */
|
||||
default:
|
||||
status = -ESHUTDOWN;
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue