aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/usb.h
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2007-05-30 16:51:28 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-12 16:34:29 -0700
commit4956eccdd6101c5abb71966079e8183d12796d6c (patch)
treed8610e3675719818e78e967ea920c4e9c8fc7ba5 /drivers/usb/core/usb.h
parentd576bb9f2769b315a795f77f0c33322a976add7a (diff)
downloadmrst-s0i3-test-4956eccdd6101c5abb71966079e8183d12796d6c.tar.gz
mrst-s0i3-test-4956eccdd6101c5abb71966079e8183d12796d6c.tar.xz
mrst-s0i3-test-4956eccdd6101c5abb71966079e8183d12796d6c.zip
USB: remove __usb_port_suspend
This patch (as915b) combines the public routine usb_port_suspend() and the private routine __usb_port_suspend() into a single function. By removing the explicit mention of otg_port in the call to __usb_port_suspend(), we prevent a possible error in which the system tries to perform HNP on the wrong port when a non-targeted device is plugged into a non-OTG port. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r--drivers/usb/core/usb.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 1a486288673..a547499c45f 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -53,8 +53,16 @@ static inline void usb_pm_unlock(struct usb_device *udev)
#else
-#define usb_port_suspend(dev) 0
-#define usb_port_resume(dev) 0
+static inline int usb_port_suspend(struct usb_device *udev)
+{
+ return 0;
+}
+
+static inline int usb_port_resume(struct usb_device *udev)
+{
+ return 0;
+}
+
static inline void usb_pm_lock(struct usb_device *udev) {}
static inline void usb_pm_unlock(struct usb_device *udev) {}