leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB / PM: Allow USB devices to remain runtime-suspended when sleeping

Browse Source 
Have dev_pm_ops.prepare return 1 for USB devices and ports so that USB
devices can remain runtime-suspended when the system goes to a sleep
state, if their wakeup state is correct and they have runtime PM enabled.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Tomeu Vizoso 2016-01-07 16:46:15 +01:00 committed by Rafael J. Wysocki
parent aa8e54b559
commit e3345db850
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/core/port.c
View File

@ -168,12 +168,18 @@ static int usb_port_runtime_suspend(struct device *dev)
return retval; return retval;
} }
static int usb_port_prepare(struct device *dev)
{
return 1;
}
#endif #endif
static const struct dev_pm_ops usb_port_pm_ops = { static const struct dev_pm_ops usb_port_pm_ops = {
#ifdef CONFIG_PM #ifdef CONFIG_PM
.runtime_suspend = usb_port_runtime_suspend, .runtime_suspend = usb_port_runtime_suspend,
.runtime_resume = usb_port_runtime_resume, .runtime_resume = usb_port_runtime_resume,
.prepare = usb_port_prepare,
#endif #endif
}; };

8
drivers/usb/core/usb.c
View File

@ -316,7 +316,13 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
static int usb_dev_prepare(struct device *dev) static int usb_dev_prepare(struct device *dev)
{ {
return 0; /* Implement eventually? */ struct usb_device *udev = to_usb_device(dev);
/* Return 0 if the current wakeup setting is wrong, otherwise 1 */
if (udev->do_remote_wakeup != device_may_wakeup(dev))
return 0;
return 1;
} }
static void usb_dev_complete(struct device *dev) static void usb_dev_complete(struct device *dev)