diff options
author | Andreas Ruprecht <rupran@einserver.de> | 2015-02-08 14:36:38 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-08 17:42:25 -0500 |
commit | f6a55884d76c5f493538866793fddd47b4ecf646 (patch) | |
tree | 4a8bfe68ee9d960cc51f0636784419a97d16a235 /drivers/usb/core | |
parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) |
USB / PM: Remove unneeded #ifdef and associated dead code
In commit ceb6c9c862c8 ("USB / PM: Drop CONFIG_PM_RUNTIME from the
USB core"), all occurrences of CONFIG_PM_RUNTIME in the USB core
code were replaced by CONFIG_PM. This created the following structure
of #ifdef blocks in drivers/usb/core/hub.c:
[...]
#ifdef CONFIG_PM
#ifdef CONFIG_PM
/* always on / undead */
#else
/* dead */
#endif
[...]
This patch removes unnecessary inner "#ifdef CONFIG_PM" as well as
the corresponding dead #else block. This inconsistency was found using
the undertaker-checkpatch tool.
Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/hub.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index aeb50bb6ba9c..eaffb0248de1 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -3452,8 +3452,6 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) | |||
3452 | return status; | 3452 | return status; |
3453 | } | 3453 | } |
3454 | 3454 | ||
3455 | #ifdef CONFIG_PM | ||
3456 | |||
3457 | int usb_remote_wakeup(struct usb_device *udev) | 3455 | int usb_remote_wakeup(struct usb_device *udev) |
3458 | { | 3456 | { |
3459 | int status = 0; | 3457 | int status = 0; |
@@ -3512,16 +3510,6 @@ static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port, | |||
3512 | return connect_change; | 3510 | return connect_change; |
3513 | } | 3511 | } |
3514 | 3512 | ||
3515 | #else | ||
3516 | |||
3517 | static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port, | ||
3518 | u16 portstatus, u16 portchange) | ||
3519 | { | ||
3520 | return 0; | ||
3521 | } | ||
3522 | |||
3523 | #endif | ||
3524 | |||
3525 | static int check_ports_changed(struct usb_hub *hub) | 3513 | static int check_ports_changed(struct usb_hub *hub) |
3526 | { | 3514 | { |
3527 | int port1; | 3515 | int port1; |