linux-kernel - Re: [PATCH 12/24] USB: ohci: move ohci_pci

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <Pine.LNX.4.44L0.1210041505090.1441-100000@iolanthe.rowland.org>
Date:	Thu, 4 Oct 2012 15:07:43 -0400 (EDT)
From:	Alan Stern <stern@...land.harvard.edu>
To:	Florian Fainelli <florian@...nwrt.org>
cc:	linux-usb@...r.kernel.org,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 12/24] USB: ohci: move ohci_pci_{suspend,resume} to
 ohci-hcd.c

On Thu, 4 Oct 2012, Florian Fainelli wrote:

> As suggested by Alan Stern, move the ohci-pci.c ohci_pci_{suspend,resume}
> routines to ohci-hcd.c. Due to their move, also rename them to
> ohci_{suspend,resume} to make it clear they operate on ohci_hcd. Since they
> are not necessarily called, annotate them with __maybe_unused.
> 
> Signed-off-by: Florian Fainelli <florian@...nwrt.org>
> ---
>  drivers/usb/host/ohci-hcd.c |   39 +++++++++++++++++++++++++++++++++++++++
>  drivers/usb/host/ohci-pci.c |   43 ++-----------------------------------------
>  2 files changed, 41 insertions(+), 41 deletions(-)
> 
> diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
> index 2b1e8d8..0cba8d6 100644
> --- a/drivers/usb/host/ohci-hcd.c
> +++ b/drivers/usb/host/ohci-hcd.c
> @@ -981,6 +981,45 @@ static int ohci_restart (struct ohci_hcd *ohci)
>  	return 0;
>  }
>  
> +static int __maybe_unused ohci_suspend(struct usb_hcd *hcd, bool do_wakeup)
> +{

...

> +	struct ohci_hcd	*ohci = hcd_to_ohci (hcd);
> +}
> +
>  #endif

How about putting these new routines _after_ this #endif?

> --- a/drivers/usb/host/ohci-pci.c
> +++ b/drivers/usb/host/ohci-pci.c
> @@ -298,45 +298,6 @@ static int __devinit ohci_pci_start (struct usb_hcd *hcd)
>  
>  #ifdef	CONFIG_PM
>  
> -static int ohci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
> -{

...

> -}
> -
>  #endif	/* CONFIG_PM */

And then moving these #ifdef and #endif lines along with them?

The point is that one condition is

	#if defined(CONFIG_PM) || defined(CONFIG_PCI)

whereas the other is just

	#ifdef CONFIG_PM

so they aren't really the same.

Alan Stern

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/