aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb.h
diff options
context:
space:
mode:
authorMing Lei <tom.leiming@gmail.com>2010-11-15 15:57:30 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-16 17:02:54 -0500
commit6ddf27cdbc218a412d7e993fdc08e30eec2042ce (patch)
tree393232ac1a8123961b62cb72cfc4b0bc617b333c /include/linux/usb.h
parent045cac6b3b067a9286dabfb789f67ae4f433f88b (diff)
USB: make usb_mark_last_busy use pm_runtime_mark_last_busy
Since the runtime-PM core already defines a .last_busy field in device.power, this patch uses it to replace the .last_busy field defined in usb_device and uses pm_runtime_mark_last_busy to implement usb_mark_last_busy. Signed-off-by: Ming Lei <tom.leiming@gmail.com> Reviewed-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.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 35fe6ab222bb..7d22b3340a7f 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -20,6 +20,7 @@
20#include <linux/completion.h> /* for struct completion */ 20#include <linux/completion.h> /* for struct completion */
21#include <linux/sched.h> /* for current && schedule_timeout */ 21#include <linux/sched.h> /* for current && schedule_timeout */
22#include <linux/mutex.h> /* for struct mutex */ 22#include <linux/mutex.h> /* for struct mutex */
23#include <linux/pm_runtime.h> /* for runtime PM */
23 24
24struct usb_device; 25struct usb_device;
25struct usb_driver; 26struct usb_driver;
@@ -407,7 +408,6 @@ struct usb_tt;
407 * @quirks: quirks of the whole device 408 * @quirks: quirks of the whole device
408 * @urbnum: number of URBs submitted for the whole device 409 * @urbnum: number of URBs submitted for the whole device
409 * @active_duration: total time device is not suspended 410 * @active_duration: total time device is not suspended
410 * @last_busy: time of last use
411 * @autosuspend_delay: in jiffies 411 * @autosuspend_delay: in jiffies
412 * @connect_time: time device was first connected 412 * @connect_time: time device was first connected
413 * @do_remote_wakeup: remote wakeup should be enabled 413 * @do_remote_wakeup: remote wakeup should be enabled
@@ -481,7 +481,6 @@ struct usb_device {
481 unsigned long active_duration; 481 unsigned long active_duration;
482 482
483#ifdef CONFIG_PM 483#ifdef CONFIG_PM
484 unsigned long last_busy;
485 int autosuspend_delay; 484 int autosuspend_delay;
486 unsigned long connect_time; 485 unsigned long connect_time;
487 486
@@ -527,7 +526,7 @@ extern void usb_autopm_put_interface_no_suspend(struct usb_interface *intf);
527 526
528static inline void usb_mark_last_busy(struct usb_device *udev) 527static inline void usb_mark_last_busy(struct usb_device *udev)
529{ 528{
530 udev->last_busy = jiffies; 529 pm_runtime_mark_last_busy(&udev->dev);
531} 530}
532 531
533#else 532#else