From: Greg Kroah-Hartman Date: Fri, 31 Jan 2025 09:06:04 +0000 (+0100) Subject: fix up 5.4 patches to actually build... X-Git-Tag: v6.13.1~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44744d1a02bda6c8dfdf98e745b535da470506a9;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 5.4 patches to actually build... --- diff --git a/queue-5.4/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch b/queue-5.4/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch index 60cb5b3d4c..66e896eeab 100644 --- a/queue-5.4/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch +++ b/queue-5.4/partial-revert-of-xhci-use-pm_ptr-instead-ifdef-for-config_pm-conditionals.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman /*-------------------------------------------------------------------------*/ -@@ -689,9 +691,11 @@ static struct pci_driver xhci_pci_driver +@@ -691,9 +693,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); diff --git a/queue-5.4/xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch b/queue-5.4/xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch index 61bfc7e52d..5989a39538 100644 --- a/queue-5.4/xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch +++ b/queue-5.4/xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch @@ -29,10 +29,10 @@ Link: https://lore.kernel.org/r/20230328131114.1296430-1-arnd@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- - drivers/usb/host/xhci-pci.c | 8 +------- + drivers/usb/host/xhci-pci.c | 4 ---- include/linux/usb.h | 3 +-- include/linux/usb/hcd.h | 2 -- - 3 files changed, 2 insertions(+), 11 deletions(-) + 3 files changed, 1 insertion(+), 8 deletions(-) --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -52,18 +52,7 @@ Signed-off-by: Greg Kroah-Hartman /*-------------------------------------------------------------------------*/ -@@ -683,21 +681,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 - }; - +@@ -693,11 +691,9 @@ static struct pci_driver xhci_pci_driver static int __init xhci_pci_init(void) { xhci_init_driver(&xhci_pci_hc_driver, &xhci_pci_overrides);