diff options
-rw-r--r-- | drivers/usb/core/hub.c | 4 | ||||
-rw-r--r-- | include/linux/usb.h | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index fcc244e9056f..04fb834c3fa1 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -3472,15 +3472,19 @@ int usb_disable_lpm(struct usb_device *udev) | |||
3472 | { | 3472 | { |
3473 | return 0; | 3473 | return 0; |
3474 | } | 3474 | } |
3475 | EXPORT_SYMBOL_GPL(usb_disable_lpm); | ||
3475 | 3476 | ||
3476 | void usb_enable_lpm(struct usb_device *udev) { } | 3477 | void usb_enable_lpm(struct usb_device *udev) { } |
3478 | EXPORT_SYMBOL_GPL(usb_enable_lpm); | ||
3477 | 3479 | ||
3478 | int usb_unlocked_disable_lpm(struct usb_device *udev) | 3480 | int usb_unlocked_disable_lpm(struct usb_device *udev) |
3479 | { | 3481 | { |
3480 | return 0; | 3482 | return 0; |
3481 | } | 3483 | } |
3484 | EXPORT_SYMBOL_GPL(usb_unlocked_disable_lpm); | ||
3482 | 3485 | ||
3483 | void usb_unlocked_enable_lpm(struct usb_device *udev) { } | 3486 | void usb_unlocked_enable_lpm(struct usb_device *udev) { } |
3487 | EXPORT_SYMBOL_GPL(usb_unlocked_enable_lpm); | ||
3484 | #endif | 3488 | #endif |
3485 | 3489 | ||
3486 | 3490 | ||
diff --git a/include/linux/usb.h b/include/linux/usb.h index c19297a8779c..dea39dc551d4 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -592,12 +592,6 @@ extern void usb_autopm_put_interface_async(struct usb_interface *intf); | |||
592 | extern void usb_autopm_get_interface_no_resume(struct usb_interface *intf); | 592 | extern void usb_autopm_get_interface_no_resume(struct usb_interface *intf); |
593 | extern void usb_autopm_put_interface_no_suspend(struct usb_interface *intf); | 593 | extern void usb_autopm_put_interface_no_suspend(struct usb_interface *intf); |
594 | 594 | ||
595 | extern int usb_disable_lpm(struct usb_device *udev); | ||
596 | extern void usb_enable_lpm(struct usb_device *udev); | ||
597 | /* Same as above, but these functions lock/unlock the bandwidth_mutex. */ | ||
598 | extern int usb_unlocked_disable_lpm(struct usb_device *udev); | ||
599 | extern void usb_unlocked_enable_lpm(struct usb_device *udev); | ||
600 | |||
601 | static inline void usb_mark_last_busy(struct usb_device *udev) | 595 | static inline void usb_mark_last_busy(struct usb_device *udev) |
602 | { | 596 | { |
603 | pm_runtime_mark_last_busy(&udev->dev); | 597 | pm_runtime_mark_last_busy(&udev->dev); |
@@ -629,6 +623,12 @@ static inline void usb_mark_last_busy(struct usb_device *udev) | |||
629 | { } | 623 | { } |
630 | #endif | 624 | #endif |
631 | 625 | ||
626 | extern int usb_disable_lpm(struct usb_device *udev); | ||
627 | extern void usb_enable_lpm(struct usb_device *udev); | ||
628 | /* Same as above, but these functions lock/unlock the bandwidth_mutex. */ | ||
629 | extern int usb_unlocked_disable_lpm(struct usb_device *udev); | ||
630 | extern void usb_unlocked_enable_lpm(struct usb_device *udev); | ||
631 | |||
632 | /*-------------------------------------------------------------------------*/ | 632 | /*-------------------------------------------------------------------------*/ |
633 | 633 | ||
634 | /* for drivers using iso endpoints */ | 634 | /* for drivers using iso endpoints */ |