| Message ID | 20191218011911.6907-1-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6056a0f8ede27b296d10ef46f7f677cc9d715371 |
| Headers | show |
| Series | usb: xhci: Fix build warning seen with CONFIG_PM=n | expand |
On Tue, Dec 17, 2019 at 05:19:11PM -0800, Guenter Roeck wrote: > 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 2f23dc86c3f8 > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/usb/host/xhci-pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Nice catch. Mathias, I can queue this up now if you give me an ack. thanks, greg k-h
On 18.12.2019 16.29, Greg Kroah-Hartman wrote: > On Tue, Dec 17, 2019 at 05:19:11PM -0800, Guenter Roeck wrote: >> 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 2f23dc86c3f8 >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >> --- >> drivers/usb/host/xhci-pci.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Nice catch. > > Mathias, I can queue this up now if you give me an ack. Yes, please Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
On Wed, Dec 18, 2019 at 05:38:06PM +0200, Mathias Nyman wrote: > On 18.12.2019 16.29, Greg Kroah-Hartman wrote: > > On Tue, Dec 17, 2019 at 05:19:11PM -0800, Guenter Roeck wrote: > > > 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 2f23dc86c3f8 Somehow I messed up the commit sha here. It is f2c710f7dca8, obviously. 2f23dc86c3f8 is the sha from v4.19.y. Sorry for that. Guenter > > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > > > --- > > > drivers/usb/host/xhci-pci.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Nice catch. > > > > Mathias, I can queue this up now if you give me an ack. > > Yes, please > > Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com> >
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 2907fe4d78dd..4917c5b033fa 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -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 */ /*-------------------------------------------------------------------------*/
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 2f23dc86c3f8 Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/usb/host/xhci-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)