Commit f6a55884 authored Feb 08, 2015 by Andreas Ruprecht Committed by Rafael J. Wysocki Feb 08, 2015

USB / PM: Remove unneeded #ifdef and associated dead code



In commit ceb6c9c8 ("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>

parent e36f014e

drivers/usb/core/hub.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -3452,8 +3452,6 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
		return status;
		}

		#ifdef CONFIG_PM

		int usb_remote_wakeup(struct usb_device *udev)
		{
		int status = 0;
		@@ -3512,16 +3510,6 @@ static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
		return connect_change;
		}

		#else

		static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
		u16 portstatus, u16 portchange)
		{
		return 0;
		}

		#endif

		static int check_ports_changed(struct usb_hub *hub)
		{
		int port1;

Admin message