diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2013-07-11 14:58:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 11:49:30 -0700 |
| commit | c4b51a431561f0bacc1740aa27f080bf95c4d6c7 (patch) | |
| tree | f326dbbfcbc4e97faa486424574b9d716f957447 /drivers/usb/core | |
| parent | 1353aa53851e3bc7f2c6365753d9c2783c34f882 (diff) | |
| download | linux-c4b51a431561f0bacc1740aa27f080bf95c4d6c7.tar.gz linux-c4b51a431561f0bacc1740aa27f080bf95c4d6c7.tar.bz2 linux-c4b51a431561f0bacc1740aa27f080bf95c4d6c7.zip | |
USB: remove redundant "#if"
This patch removes a redundant nested "#ifdef CONFIG_PM" from the hub
driver. It also adds a label to the "#endif" line corresponding to
the outer "#ifdef CONFIG_PM".
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/hub.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 4191db32f12c..f735f6bc929c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2829,7 +2829,6 @@ void usb_enable_ltm(struct usb_device *udev) } EXPORT_SYMBOL_GPL(usb_enable_ltm); -#ifdef CONFIG_PM /* * usb_disable_function_remotewakeup - disable usb3.0 * device's function remote wakeup @@ -3249,8 +3248,6 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) return status; } -#endif /* CONFIG_PM */ - #ifdef CONFIG_PM_RUNTIME /* caller has locked udev */ @@ -3811,7 +3808,8 @@ EXPORT_SYMBOL_GPL(usb_disable_ltm); void usb_enable_ltm(struct usb_device *udev) { } EXPORT_SYMBOL_GPL(usb_enable_ltm); -#endif + +#endif /* CONFIG_PM */ /* USB 2.0 spec, 7.1.7.3 / fig 7-29: |