aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb.h
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2009-11-13 11:53:59 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 14:55:21 -0500
commitfb34d53752d5bec5acc73422e462a9c68aeeaa2a (patch)
tree6a395f2a0246cd3d721753c60af13e8f9b2e9c41 /include/linux/usb.h
parent576a362ad2103da481e1f6e13de01f33d3d4c7b1 (diff)
USB: remove the auto_pm flag
This patch (as1302) removes the auto_pm flag from struct usb_device. The flag's only purpose was to distinguish between autosuspends and external suspends, but that information is now available in the pm_message_t argument passed to suspend methods. 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.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 6e91ee4f5b81..4b6f6db544ee 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -429,7 +429,6 @@ struct usb_tt;
429 * @last_busy: time of last use 429 * @last_busy: time of last use
430 * @autosuspend_delay: in jiffies 430 * @autosuspend_delay: in jiffies
431 * @connect_time: time device was first connected 431 * @connect_time: time device was first connected
432 * @auto_pm: autosuspend/resume in progress
433 * @do_remote_wakeup: remote wakeup should be enabled 432 * @do_remote_wakeup: remote wakeup should be enabled
434 * @reset_resume: needs reset instead of resume 433 * @reset_resume: needs reset instead of resume
435 * @autosuspend_disabled: autosuspend disabled by the user 434 * @autosuspend_disabled: autosuspend disabled by the user
@@ -514,7 +513,6 @@ struct usb_device {
514 int autosuspend_delay; 513 int autosuspend_delay;
515 unsigned long connect_time; 514 unsigned long connect_time;
516 515
517 unsigned auto_pm:1;
518 unsigned do_remote_wakeup:1; 516 unsigned do_remote_wakeup:1;
519 unsigned reset_resume:1; 517 unsigned reset_resume:1;
520 unsigned autosuspend_disabled:1; 518 unsigned autosuspend_disabled:1;