diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-03-28 15:10:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-23 17:16:04 +0100 |
| commit | 0bd4efe3226d229189573d9881aec868700d9293 (patch) | |
| tree | 6d092eae1fd5a4a9d7c181f62f4ec8455a85bc8b /include | |
| parent | c3d052cae566ec2285f5999958a5deb415a0f59e (diff) | |
| download | linux-0bd4efe3226d229189573d9881aec868700d9293.tar.gz linux-0bd4efe3226d229189573d9881aec868700d9293.tar.bz2 linux-0bd4efe3226d229189573d9881aec868700d9293.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb.h | 3 | ||||
| -rw-r--r-- | include/linux/usb/hcd.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 987550fd46fa..15247a1cc65c 100644 --- 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 e4e18a5faa9f..aa43ef8a7aa3 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -500,9 +500,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 */ |