diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-02-08 13:18:16 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2010-02-26 14:39:12 -0500 |
commit | 927bc9165d3cd01054b472f9b25d91a8707209c8 (patch) | |
tree | ce0278e5f7acd62da2c3c7e66b205c8542cb0f62 | |
parent | 6d19c009cc780c63de25a046509ebc9473809fd6 (diff) |
PM: Allow USB devices to suspend/resume asynchronously
Set power.async_suspend for USB devices, endpoints and interfaces,
allowing them to be suspended and resumed asynchronously during
system sleep transitions.
The power.async_suspend flag is also set for devices that don't have
suspend or resume callbacks, because otherwise they would make the
main suspend/resume thread wait for their "asynchronous" children
(during suspend) or parents (during resume), effectively negating the
possible gains from executing these devices' suspend and resume
callbacks asynchronously.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r-- | drivers/usb/core/endpoint.c | 1 | ||||
-rw-r--r-- | drivers/usb/core/hub.c | 1 | ||||
-rw-r--r-- | drivers/usb/core/message.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c index fdfaa7885515..d26b9ea981f9 100644 --- a/drivers/usb/core/endpoint.c +++ b/drivers/usb/core/endpoint.c | |||
@@ -186,6 +186,7 @@ int usb_create_ep_devs(struct device *parent, | |||
186 | ep_dev->dev.parent = parent; | 186 | ep_dev->dev.parent = parent; |
187 | ep_dev->dev.release = ep_device_release; | 187 | ep_dev->dev.release = ep_device_release; |
188 | dev_set_name(&ep_dev->dev, "ep_%02x", endpoint->desc.bEndpointAddress); | 188 | dev_set_name(&ep_dev->dev, "ep_%02x", endpoint->desc.bEndpointAddress); |
189 | device_enable_async_suspend(&ep_dev->dev); | ||
189 | 190 | ||
190 | retval = device_register(&ep_dev->dev); | 191 | retval = device_register(&ep_dev->dev); |
191 | if (retval) | 192 | if (retval) |
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 35cc8b9ba1f5..20ecb4cec8de 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1817,6 +1817,7 @@ int usb_new_device(struct usb_device *udev) | |||
1817 | /* Tell the world! */ | 1817 | /* Tell the world! */ |
1818 | announce_device(udev); | 1818 | announce_device(udev); |
1819 | 1819 | ||
1820 | device_enable_async_suspend(&udev->dev); | ||
1820 | /* Register the device. The device driver is responsible | 1821 | /* Register the device. The device driver is responsible |
1821 | * for configuring the device and invoking the add-device | 1822 | * for configuring the device and invoking the add-device |
1822 | * notifier chain (used by usbfs and possibly others). | 1823 | * notifier chain (used by usbfs and possibly others). |
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 9bc95fec793f..df73574a9cc9 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1867,6 +1867,7 @@ free_interfaces: | |||
1867 | "adding %s (config #%d, interface %d)\n", | 1867 | "adding %s (config #%d, interface %d)\n", |
1868 | dev_name(&intf->dev), configuration, | 1868 | dev_name(&intf->dev), configuration, |
1869 | intf->cur_altsetting->desc.bInterfaceNumber); | 1869 | intf->cur_altsetting->desc.bInterfaceNumber); |
1870 | device_enable_async_suspend(&intf->dev); | ||
1870 | ret = device_add(&intf->dev); | 1871 | ret = device_add(&intf->dev); |
1871 | if (ret != 0) { | 1872 | if (ret != 0) { |
1872 | dev_err(&dev->dev, "device_add(%s) --> %d\n", | 1873 | dev_err(&dev->dev, "device_add(%s) --> %d\n", |