Commit 01bb59eb authored Apr 25, 2014 by David Cohen Committed by Greg Kroah-Hartman Apr 25, 2014

usb/xhci: fix compilation warning when !CONFIG_PCI && !CONFIG_PM



When CONFIG_PCI and CONFIG_PM are not selected, xhci.c gets this
warning:
drivers/usb/host/xhci.c:409:13: warning: ‘xhci_msix_sync_irqs’ defined
but not used [-Wunused-function]

Instead of creating nested #ifdefs, this patch fixes it by defining the
xHCI PCI stubs as inline.

This warning has been in since 3.2 kernel and was
caused by commit 421aa841
"usb/xhci: hide MSI code behind PCI bars", but wasn't noticed
until 3.13 when a configuration with these options was tried

Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Cc: stable@vger.kernel.org # 3.2
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6db249eb

drivers/usb/host/xhci.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -408,16 +408,16 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd)

		#else

		static int xhci_try_enable_msi(struct usb_hcd *hcd)
		static inline int xhci_try_enable_msi(struct usb_hcd *hcd)
		{
		return 0;
		}

		static void xhci_cleanup_msix(struct xhci_hcd *xhci)
		static inline void xhci_cleanup_msix(struct xhci_hcd *xhci)
		{
		}

		static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
		static inline void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
		{
		}

Admin message