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

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

USB: remove references to dev.power.power_state 



This revised patch (as891b) removes two unnecessary references to
intf->dev.power.power_state from usb-storage, and replaces a reference
to root_hub->dev.power.power_state with a check of hcd->state.  This
is in preparation for the removal of dev.power.power_state, which is
already deprecated.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8adb4786

drivers/usb/core/hcd-pci.c

+2 −1
Original line number Diff line number Diff line
@@ -207,7 +207,8 @@ int usb_hcd_pci_suspend (struct pci_dev *dev, pm_message_t message) 
	 * We must ignore the FREEZE vs SUSPEND distinction here, because

	 * otherwise the swsusp will save (and restore) garbage state.

	 */

	if (hcd->self.root_hub->dev.power.power_state.event == PM_EVENT_ON)

	if (!(hcd->state == HC_STATE_SUSPENDED ||

			hcd->state == HC_STATE_HALT))

		return -EBUSY;



	if (hcd->driver->suspend) {

drivers/usb/storage/usb.c

+0 −2
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ static int storage_suspend(struct usb_interface *iface, pm_message_t message) 
	US_DEBUGP("%s\n", __FUNCTION__);

	if (us->suspend_resume_hook)

		(us->suspend_resume_hook)(us, US_SUSPEND);

	iface->dev.power.power_state.event = message.event;



	/* When runtime PM is working, we'll set a flag to indicate

	 * whether we should autoresume when a SCSI request arrives. */
@@ -215,7 +214,6 @@ static int storage_resume(struct usb_interface *iface) 
	US_DEBUGP("%s\n", __FUNCTION__);

	if (us->suspend_resume_hook)

		(us->suspend_resume_hook)(us, US_RESUME);

	iface->dev.power.power_state.event = PM_EVENT_ON;



	mutex_unlock(&us->dev_mutex);

	return 0;