Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758724AbbBGVA0 (ORCPT ); Sat, 7 Feb 2015 16:00:26 -0500 Received: from mail-we0-f177.google.com ([74.125.82.177]:37789 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758240AbbBGVAZ (ORCPT ); Sat, 7 Feb 2015 16:00:25 -0500 From: Andreas Ruprecht To: "Rafael J. Wysocki" Cc: Alan Stern , Greg Kroah-Hartman , Dan Williams , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Ruprecht Subject: [PATCH] usb/core: Remove unneeded #ifdef and associated dead code Date: Sat, 7 Feb 2015 22:00:11 +0100 Message-Id: <1423342811-17608-1-git-send-email-rupran@einserver.de> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1594 Lines: 61 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 the function in the dead #ifdef block and the unnecessary inner #ifdef. This inconsistency was found using the undertaker-checkpatch tool. Signed-off-by: Andreas Ruprecht --- drivers/usb/core/hub.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 3e9c4d4..c362bbc 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) 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; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/