xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals

commit 130eac4170859fb368681e00d390f20f44bbf27b upstream.

A recent patch caused an unused-function warning in builds with
CONFIG_PM disabled, after the function became marked 'static':

drivers/usb/host/xhci-pci.c:91:13: error: 'xhci_msix_sync_irqs' defined but not used [-Werror=unused-function]
   91 | static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
      |             ^~~~~~~~~~~~~~~~~~~

This could be solved by adding another #ifdef, but as there is
a trend towards removing CONFIG_PM checks in favor of helper
macros, do the same conversion here and use pm_ptr() to get
either a function pointer or NULL but avoid the warning.

As the hidden functions reference some other symbols, make
sure those are visible at compile time, at the minimal cost of
a few extra bytes for 'struct usb_device'.

Fixes: 9abe15d55dcc ("xhci: Move xhci MSI sync function to to xhci-pci")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230328131114.1296430-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 572e44811805da31735572ac1e2eef6651f6b1fa..692a8958ce1de96894964ee955fe7e01871b68dd 100644 (file)
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -561,7 +561,6 @@ static void xhci_pci_remove(struct pci_dev *dev)
                pci_set_power_state(dev, PCI_D3hot);
 }
 
-#ifdef CONFIG_PM
 /*
  * In some Intel xHCI controllers, in order to get D3 working,
  * through a vendor specific SSIC CONFIG register at offset 0x883c,
@@ -704,7 +703,6 @@ 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 */
 
 /*-------------------------------------------------------------------------*/
 
@@ -746,21 +744,17 @@ static struct pci_driver xhci_pci_driver = {
        /* suspend and resume implemented later */
 
        .shutdown =     usb_hcd_pci_shutdown,
-#ifdef CONFIG_PM
        .driver = {
-               .pm = &usb_hcd_pci_pm_ops
+               .pm = pm_ptr(&usb_hcd_pci_pm_ops),
        },
-#endif
 };
 
 static int __init xhci_pci_init(void)
 {
        xhci_init_driver(&xhci_pci_hc_driver, &xhci_pci_overrides);
-#ifdef CONFIG_PM
        xhci_pci_hc_driver.pci_suspend = xhci_pci_suspend;
        xhci_pci_hc_driver.pci_resume = xhci_pci_resume;
        xhci_pci_hc_driver.shutdown = xhci_pci_shutdown;
-#endif
        return pci_register_driver(&xhci_pci_driver);
 }
 module_init(xhci_pci_init);

diff --git a/include/linux/usb.h b/include/linux/usb.h
index e02cf70ca52f6a0182d0df9766d6906674310ff9..a0477454ad56955302fb7aab552123552be4a3d8 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -695,13 +695,12 @@ struct usb_device {
 
        unsigned long active_duration;
 
-#ifdef CONFIG_PM
        unsigned long connect_time;
 
        unsigned do_remote_wakeup:1;
        unsigned reset_resume:1;
        unsigned port_is_suspended:1;
-#endif
+
        struct wusb_dev *wusb_dev;
        int slot_id;
        struct usb2_lpm_parameters l1_params;

diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 528be670006f498177ca1d5d9ee0c8441b90d3e8..4cd545402a6345e96738dc0a2b51427d304f31e9 100644 (file)
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -489,9 +489,7 @@ extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 
 extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev);
 
-#ifdef CONFIG_PM
 extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
-#endif
 #endif /* CONFIG_USB_PCI */
 
 /* pci-ish (pdev null is ok) buffer alloc/mapping support */