From 4d5f467b50f43c1f78a2bbd618bcb3d30832ce9d Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Mon, 21 May 2012 08:29:01 -0700 Subject: [PATCH] --- yaml --- r: 304008 b: refs/heads/master c: e9261fb62a8b6a79a58c57cc6f4a40530b040b61 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hub.c | 4 ++++ trunk/include/linux/usb.h | 12 ++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 714e53a5112e..108c5836b879 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c51fa66802b922070dfda0d77fac364c367db5f6 +refs/heads/master: e9261fb62a8b6a79a58c57cc6f4a40530b040b61 diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index fcc244e9056f..04fb834c3fa1 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -3472,15 +3472,19 @@ int usb_disable_lpm(struct usb_device *udev) { return 0; } +EXPORT_SYMBOL_GPL(usb_disable_lpm); void usb_enable_lpm(struct usb_device *udev) { } +EXPORT_SYMBOL_GPL(usb_enable_lpm); int usb_unlocked_disable_lpm(struct usb_device *udev) { return 0; } +EXPORT_SYMBOL_GPL(usb_unlocked_disable_lpm); void usb_unlocked_enable_lpm(struct usb_device *udev) { } +EXPORT_SYMBOL_GPL(usb_unlocked_enable_lpm); #endif diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index c19297a8779c..dea39dc551d4 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -592,12 +592,6 @@ extern void usb_autopm_put_interface_async(struct usb_interface *intf); extern void usb_autopm_get_interface_no_resume(struct usb_interface *intf); extern void usb_autopm_put_interface_no_suspend(struct usb_interface *intf); -extern int usb_disable_lpm(struct usb_device *udev); -extern void usb_enable_lpm(struct usb_device *udev); -/* Same as above, but these functions lock/unlock the bandwidth_mutex. */ -extern int usb_unlocked_disable_lpm(struct usb_device *udev); -extern void usb_unlocked_enable_lpm(struct usb_device *udev); - static inline void usb_mark_last_busy(struct usb_device *udev) { pm_runtime_mark_last_busy(&udev->dev); @@ -629,6 +623,12 @@ static inline void usb_mark_last_busy(struct usb_device *udev) { } #endif +extern int usb_disable_lpm(struct usb_device *udev); +extern void usb_enable_lpm(struct usb_device *udev); +/* Same as above, but these functions lock/unlock the bandwidth_mutex. */ +extern int usb_unlocked_disable_lpm(struct usb_device *udev); +extern void usb_unlocked_enable_lpm(struct usb_device *udev); + /*-------------------------------------------------------------------------*/ /* for drivers using iso endpoints */