diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2010-11-15 15:57:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-16 17:03:41 -0500 |
commit | fcc4a01eb8661226e80632327673f67bf6a5840b (patch) | |
tree | dc05c200ccfac2daad6d1efe413ae6fa92f1638d /include/linux/usb.h | |
parent | 6ddf27cdbc218a412d7e993fdc08e30eec2042ce (diff) |
USB: use the runtime-PM autosuspend implementation
This patch (as1428) converts USB over to the new runtime-PM core
autosuspend framework. One slightly awkward aspect of the conversion
is that USB devices will now have two suspend-delay attributes: the
old power/autosuspend file and the new power/autosuspend_delay_ms
file. One expresses the delay time in seconds and the other in
milliseconds, but otherwise they do the same thing. The old attribute
can be deprecated and then removed eventually.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 7d22b3340a7f..5ee2223af08c 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -408,7 +408,6 @@ struct usb_tt; | |||
408 | * @quirks: quirks of the whole device | 408 | * @quirks: quirks of the whole device |
409 | * @urbnum: number of URBs submitted for the whole device | 409 | * @urbnum: number of URBs submitted for the whole device |
410 | * @active_duration: total time device is not suspended | 410 | * @active_duration: total time device is not suspended |
411 | * @autosuspend_delay: in jiffies | ||
412 | * @connect_time: time device was first connected | 411 | * @connect_time: time device was first connected |
413 | * @do_remote_wakeup: remote wakeup should be enabled | 412 | * @do_remote_wakeup: remote wakeup should be enabled |
414 | * @reset_resume: needs reset instead of resume | 413 | * @reset_resume: needs reset instead of resume |
@@ -481,7 +480,6 @@ struct usb_device { | |||
481 | unsigned long active_duration; | 480 | unsigned long active_duration; |
482 | 481 | ||
483 | #ifdef CONFIG_PM | 482 | #ifdef CONFIG_PM |
484 | int autosuspend_delay; | ||
485 | unsigned long connect_time; | 483 | unsigned long connect_time; |
486 | 484 | ||
487 | unsigned do_remote_wakeup:1; | 485 | unsigned do_remote_wakeup:1; |