commit f4f677285b389e3d1bead19ad6b806527bf693f3 Author: Greg Kroah-Hartman Date: Sun Jan 19 09:01:16 2025 +0100 Linux 6.1.126 Signed-off-by: Greg Kroah-Hartman commit f6247d3e3f2d34842d3dcec8fe7a792db969c423 Author: Ron Economos Date: Sat Jan 18 04:24:09 2025 -0800 Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals commit 9734fd7a2777 ("xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals") did not quite work properly in the 6.1.y branch where it was applied to fix a build error when CONFIG_PM was set as it left the following build errors still present: ERROR: modpost: "xhci_suspend" [drivers/usb/host/xhci-pci.ko] undefined! ERROR: modpost: "xhci_resume" [drivers/usb/host/xhci-pci.ko] undefined! Fix this up by properly placing the #ifdef CONFIG_PM in the xhci-pci.c and hcd.h files to handle this correctly. Link: https://lore.kernel.org/r/133dbfa0-4a37-4ae0-bb95-1a35f668ec11@w6rz.net Signed-off-by: Ron Economos Link: https://lore.kernel.org/r/d0919169-ee06-4bdd-b2e3-2f776db90971@roeck-us.net Reported-by: Guenter Roeck [ Trimmed the partial revert down to an even smaller bit to only be what is required to fix the build error - gregkh] Signed-off-by: Greg Kroah-Hartman