]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
usb: xhci: Fix build warning seen with CONFIG_PM=n
authorGuenter Roeck <linux@roeck-us.net>
Wed, 18 Dec 2019 01:19:11 +0000 (17:19 -0800)
committerSeth Forshee <seth.forshee@canonical.com>
Mon, 6 Jan 2020 14:17:34 +0000 (08:17 -0600)
BugLink: https://bugs.launchpad.net/bugs/1858428
[ Upstream commit 6056a0f8ede27b296d10ef46f7f677cc9d715371 ]

The following build warning is seen if CONFIG_PM is disabled.

drivers/usb/host/xhci-pci.c:498:13: warning:
unused function 'xhci_pci_shutdown'

Fixes: f2c710f7dca8 ("usb: xhci: only set D3hot for pci device")
Cc: Henry Lin <henryl@nvidia.com>
Cc: stable@vger.kernel.org # all stable releases with f2c710f7dca8
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20191218011911.6907-1-linux@roeck-us.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/usb/host/xhci-pci.c

index 2907fe4d78ddd3e78976a9f1306e296056da73ae..4917c5b033faccd0f6b9fe903dbf99cb8a47d62c 100644 (file)
@@ -519,7 +519,6 @@ static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
        retval = xhci_resume(xhci, hibernated);
        return retval;
 }
-#endif /* CONFIG_PM */
 
 static void xhci_pci_shutdown(struct usb_hcd *hcd)
 {
@@ -532,6 +531,7 @@ static void xhci_pci_shutdown(struct usb_hcd *hcd)
        if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
                pci_set_power_state(pdev, PCI_D3hot);
 }
+#endif /* CONFIG_PM */
 
 /*-------------------------------------------------------------------------*/