From 0aaa622f49b90ec70778e0302680147b4d7c1395 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 19 Jan 2025 08:37:53 +0100 Subject: [PATCH] make queue-6.1/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch smaller --- ...ead-ifdef-for-config_pm-conditionals.patch | 32 +++---------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/queue-6.1/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch b/queue-6.1/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch index 3f4f0495c5..0756bf271c 100644 --- a/queue-6.1/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch +++ b/queue-6.1/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch @@ -20,11 +20,12 @@ 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 --- - drivers/usb/host/xhci-pci.c | 8 +++++++- - include/linux/usb/hcd.h | 2 ++ - 2 files changed, 9 insertions(+), 1 deletion(-) + drivers/usb/host/xhci-pci.c | 4 ++++ + 1 file changed, 4 insertions(+) --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -44,18 +45,7 @@ Signed-off-by: Greg Kroah-Hartman /*-------------------------------------------------------------------------*/ -@@ -761,17 +763,21 @@ static struct pci_driver xhci_pci_driver - /* suspend and resume implemented later */ - - .shutdown = usb_hcd_pci_shutdown, -+#ifdef CONFIG_PM - .driver = { -- .pm = pm_ptr(&usb_hcd_pci_pm_ops), -+ .pm = &usb_hcd_pci_pm_ops - }, -+#endif - }; - +@@ -769,9 +771,11 @@ static struct pci_driver xhci_pci_driver static int __init xhci_pci_init(void) { xhci_init_driver(&xhci_pci_hc_driver, &xhci_pci_overrides); @@ -67,15 +57,3 @@ Signed-off-by: Greg Kroah-Hartman return pci_register_driver(&xhci_pci_driver); } module_init(xhci_pci_init); ---- a/include/linux/usb/hcd.h -+++ b/include/linux/usb/hcd.h -@@ -486,7 +486,9 @@ extern void usb_hcd_pci_shutdown(struct - - 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 */ -- 2.47.2