Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7e6da9e authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 317c67b8

drivers/usb/core/driver.c

+1 −5
Original line number Diff line number Diff line
@@ -1196,10 +1196,6 @@ 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);

 		}

	} else {

drivers/usb/core/hcd.c

+0 −10
Original line number Diff line number Diff line
@@ -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;