From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Andreas Ruprecht <rupran@einserver.de>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        Alan Stern <stern@rowland.harvard.edu>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Dan Williams <dan.j.williams@intel.com>, linux-usb@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] usb: core: Remove unneeded #ifdef and associated dead code
Date: Mon, 09 Feb 2015 00:05:51 +0100
Message-ID: <2409529.oE9kf9F9bc@vostro.rjw.lan>
User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; )
In-Reply-To: <1423424198-15731-1-git-send-email-rupran@einserver.de>
References: <1423342811-17608-1-git-send-email-rupran@einserver.de> <1423424198-15731-1-git-send-email-rupran@einserver.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="utf-8"
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1963
Lines: 70

On Sunday, February 08, 2015 08:36:38 PM Andreas Ruprecht wrote:
> 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>

Applied, thanks!

> ---
> Changes to v1:
>     - Better description of what was removed in the commit message
> 
>  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;
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
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/