linux-kernel - Re: [PATCH] usb: xhci: Mark two functions __maybe

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]

Date:	Wed, 24 Jul 2013 11:26:35 -0700
From:	Sarah Sharp <sarah.a.sharp@...ux.intel.com>
To:	Olof Johansson <olof@...om.net>
Cc:	linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] usb: xhci: Mark two functions __maybe_unused

On Tue, Jul 23, 2013 at 11:58:20AM -0700, Olof Johansson wrote:
> Resolves the following build warnings:
> drivers/usb/host/xhci.c:332:13: warning: 'xhci_msix_sync_irqs' defined but not used [-Wunused-function]
> drivers/usb/host/xhci.c:3901:12: warning: 'xhci_change_max_exit_latency' defined but not used [-Wunused-function]
> 
> These functions are not always used, and since they're marked static
> they will produce build warnings:
> - xhci_msix_sync_irqs is only used with CONFIG_PCI.
> - xhci_change_max_exit_latency is a little more complicated with
>   dependencies on CONFIG_PM and CONFIG_PM_RUNTIME.
> 
> Instead of building a bigger maze of ifdefs in this code, I've just
> marked both with __maybe_unused.
> 
> Signed-off-by: Olof Johansson <olof@...om.net>
> ---
> 
> Sarah,
> 
> I guess taste might differ on ifdef vs __maybe_unused, let me know this
> is not to your liking.

__maybe_unused is fine, I will queue this up shortly.

Sarah Sharp

> 
> Thanks,
> 
> -Olof
> 
>  drivers/usb/host/xhci.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 2c49f00..87ae8cd 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -329,7 +329,7 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci)
>  	return;
>  }
>  
> -static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
> +static void __maybe_unused xhci_msix_sync_irqs(struct xhci_hcd *xhci)
>  {
>  	int i;
>  
> @@ -3898,7 +3898,7 @@ int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1)
>   * Issue an Evaluate Context command to change the Maximum Exit Latency in the
>   * slot context.  If that succeeds, store the new MEL in the xhci_virt_device.
>   */
> -static int xhci_change_max_exit_latency(struct xhci_hcd *xhci,
> +static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci,
>  			struct usb_device *udev, u16 max_exit_latency)
>  {
>  	struct xhci_virt_device *virt_dev;
> -- 
> 1.7.10.4
> 
--
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/