|
Takashi Iwai |
f764ca |
From 6056a0f8ede27b296d10ef46f7f677cc9d715371 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
f764ca |
From: Guenter Roeck <linux@roeck-us.net>
|
|
Takashi Iwai |
f764ca |
Date: Tue, 17 Dec 2019 17:19:11 -0800
|
|
Takashi Iwai |
f764ca |
Subject: [PATCH] usb: xhci: Fix build warning seen with CONFIG_PM=n
|
|
Takashi Iwai |
f764ca |
Git-commit: 6056a0f8ede27b296d10ef46f7f677cc9d715371
|
|
Takashi Iwai |
f764ca |
Patch-mainline: v5.5-rc3
|
|
Takashi Iwai |
f764ca |
References: bsc#1051510
|
|
Takashi Iwai |
f764ca |
|
|
Takashi Iwai |
f764ca |
The following build warning is seen if CONFIG_PM is disabled.
|
|
Takashi Iwai |
f764ca |
|
|
Takashi Iwai |
f764ca |
drivers/usb/host/xhci-pci.c:498:13: warning:
|
|
Takashi Iwai |
f764ca |
unused function 'xhci_pci_shutdown'
|
|
Takashi Iwai |
f764ca |
|
|
Takashi Iwai |
f764ca |
Fixes: f2c710f7dca8 ("usb: xhci: only set D3hot for pci device")
|
|
Takashi Iwai |
f764ca |
Cc: Henry Lin <henryl@nvidia.com>
|
|
Takashi Iwai |
f764ca |
Cc: stable@vger.kernel.org # all stable releases with f2c710f7dca8
|
|
Takashi Iwai |
f764ca |
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
|
Takashi Iwai |
f764ca |
Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
|
|
Takashi Iwai |
f764ca |
Link: https://lore.kernel.org/r/20191218011911.6907-1-linux@roeck-us.net
|
|
Takashi Iwai |
f764ca |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
f764ca |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
f764ca |
|
|
Takashi Iwai |
f764ca |
---
|
|
Takashi Iwai |
f764ca |
drivers/usb/host/xhci-pci.c | 2 +-
|
|
Takashi Iwai |
f764ca |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Takashi Iwai |
f764ca |
|
|
Takashi Iwai |
f764ca |
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
|
|
Takashi Iwai |
f764ca |
index 2907fe4d78dd..4917c5b033fa 100644
|
|
Takashi Iwai |
f764ca |
--- a/drivers/usb/host/xhci-pci.c
|
|
Takashi Iwai |
f764ca |
+++ b/drivers/usb/host/xhci-pci.c
|
|
Takashi Iwai |
f764ca |
@@ -519,7 +519,6 @@ static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
|
|
Takashi Iwai |
f764ca |
retval = xhci_resume(xhci, hibernated);
|
|
Takashi Iwai |
f764ca |
return retval;
|
|
Takashi Iwai |
f764ca |
}
|
|
Takashi Iwai |
f764ca |
-#endif /* CONFIG_PM */
|
|
Takashi Iwai |
f764ca |
|
|
Takashi Iwai |
f764ca |
static void xhci_pci_shutdown(struct usb_hcd *hcd)
|
|
Takashi Iwai |
f764ca |
{
|
|
Takashi Iwai |
f764ca |
@@ -532,6 +531,7 @@ static void xhci_pci_shutdown(struct usb_hcd *hcd)
|
|
Takashi Iwai |
f764ca |
if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
|
|
Takashi Iwai |
f764ca |
pci_set_power_state(pdev, PCI_D3hot);
|
|
Takashi Iwai |
f764ca |
}
|
|
Takashi Iwai |
f764ca |
+#endif /* CONFIG_PM */
|
|
Takashi Iwai |
f764ca |
|
|
Takashi Iwai |
f764ca |
/*-------------------------------------------------------------------------*/
|
|
Takashi Iwai |
f764ca |
|
|
Takashi Iwai |
f764ca |
--
|
|
Takashi Iwai |
f764ca |
2.16.4
|
|
Takashi Iwai |
f764ca |
|