aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r--include/linux/usb.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index a28eb2592577..bd69b65f3356 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;
@@ -411,8 +412,6 @@ struct usb_tt;
411 * @quirks: quirks of the whole device 412 * @quirks: quirks of the whole device
412 * @urbnum: number of URBs submitted for the whole device 413 * @urbnum: number of URBs submitted for the whole device
413 * @active_duration: total time device is not suspended 414 * @active_duration: total time device is not suspended
414 * @last_busy: time of last use
415 * @autosuspend_delay: in jiffies
416 * @connect_time: time device was first connected 415 * @connect_time: time device was first connected
417 * @do_remote_wakeup: remote wakeup should be enabled 416 * @do_remote_wakeup: remote wakeup should be enabled
418 * @reset_resume: needs reset instead of resume 417 * @reset_resume: needs reset instead of resume
@@ -485,8 +484,6 @@ struct usb_device {
485 unsigned long active_duration; 484 unsigned long active_duration;
486 485
487#ifdef CONFIG_PM 486#ifdef CONFIG_PM
488 unsigned long last_busy;
489 int autosuspend_delay;
490 unsigned long connect_time; 487 unsigned long connect_time;
491 488
492 unsigned do_remote_wakeup:1; 489 unsigned do_remote_wakeup:1;
@@ -531,7 +528,7 @@ extern void usb_autopm_put_interface_no_suspend(struct usb_interface *intf);
531 528
532static inline void usb_mark_last_busy(struct usb_device *udev) 529static inline void usb_mark_last_busy(struct usb_device *udev)
533{ 530{
534 udev->last_busy = jiffies; 531 pm_runtime_mark_last_busy(&udev->dev);
535} 532}
536 533
537#else 534#else