From: Greg Kroah-Hartman Date: Tue, 9 May 2023 03:01:57 +0000 (+0200) Subject: drop some bcm63xx patches as they break things. X-Git-Tag: v5.15.111~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b789e1dd1f4b72b584f0f98435dee6237b4b4fa0;p=thirdparty%2Fkernel%2Fstable-queue.git drop some bcm63xx patches as they break things. --- diff --git a/queue-4.14/series b/queue-4.14/series index 17b4b0a3b31..00e05a07085 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -54,7 +54,6 @@ tty-serial-fsl_lpuart-adjust-buffer-length-to-the-in.patch serial-8250-add-missing-wakeup-event-reporting.patch staging-rtl8192e-fix-w_disable-does-not-work-after-s.patch spmi-add-a-check-for-remove-callback-when-removing-a.patch -spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch macintosh-windfarm_smu_sat-add-missing-of_node_put.patch powerpc-mpc512x-fix-resource-printk-format-warning.patch powerpc-wii-fix-resource-printk-format-warnings.patch diff --git a/queue-4.14/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch b/queue-4.14/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch deleted file mode 100644 index bd00b6282ba..00000000000 --- a/queue-4.14/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5d6d21696db98be3c7db3d076e3d87fa93cb24cf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Apr 2023 17:46:15 +0530 -Subject: spi: bcm63xx: remove PM_SLEEP based conditional compilation - -From: Dhruva Gole - -[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] - -Get rid of conditional compilation based on CONFIG_PM_SLEEP because -it may introduce build issues with certain configs where it maybe disabled -This is because if above config is not enabled the suspend-resume -functions are never part of the code but the bcm63xx_spi_pm_ops struct -still inits them to non-existent suspend-resume functions. - -Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c -index bfe5754768f97..c7b67388709fe 100644 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -625,7 +625,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) - return 0; - } - --#ifdef CONFIG_PM_SLEEP - static int bcm63xx_spi_suspend(struct device *dev) - { - struct spi_master *master = dev_get_drvdata(dev); -@@ -652,7 +651,6 @@ static int bcm63xx_spi_resume(struct device *dev) - - return 0; - } --#endif - - static const struct dev_pm_ops bcm63xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --- -2.39.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 7fc16360b13..0324c8b469f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -101,7 +101,6 @@ tty-serial-fsl_lpuart-adjust-buffer-length-to-the-in.patch serial-8250-add-missing-wakeup-event-reporting.patch staging-rtl8192e-fix-w_disable-does-not-work-after-s.patch spmi-add-a-check-for-remove-callback-when-removing-a.patch -spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch macintosh-windfarm_smu_sat-add-missing-of_node_put.patch powerpc-mpc512x-fix-resource-printk-format-warning.patch powerpc-wii-fix-resource-printk-format-warnings.patch diff --git a/queue-4.19/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch b/queue-4.19/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch deleted file mode 100644 index 2e566d9a533..00000000000 --- a/queue-4.19/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 77c742edaec6bb38b0da9ad55dc7289d5b2f5ada Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Apr 2023 17:46:15 +0530 -Subject: spi: bcm63xx: remove PM_SLEEP based conditional compilation - -From: Dhruva Gole - -[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] - -Get rid of conditional compilation based on CONFIG_PM_SLEEP because -it may introduce build issues with certain configs where it maybe disabled -This is because if above config is not enabled the suspend-resume -functions are never part of the code but the bcm63xx_spi_pm_ops struct -still inits them to non-existent suspend-resume functions. - -Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c -index bfe5754768f97..c7b67388709fe 100644 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -625,7 +625,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) - return 0; - } - --#ifdef CONFIG_PM_SLEEP - static int bcm63xx_spi_suspend(struct device *dev) - { - struct spi_master *master = dev_get_drvdata(dev); -@@ -652,7 +651,6 @@ static int bcm63xx_spi_resume(struct device *dev) - - return 0; - } --#endif - - static const struct dev_pm_ops bcm63xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --- -2.39.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 6503592e2ee..90de5627e49 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -225,7 +225,6 @@ tty-serial-fsl_lpuart-adjust-buffer-length-to-the-in.patch serial-8250-add-missing-wakeup-event-reporting.patch staging-rtl8192e-fix-w_disable-does-not-work-after-s.patch spmi-add-a-check-for-remove-callback-when-removing-a.patch -spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch macintosh-windfarm_smu_sat-add-missing-of_node_put.patch powerpc-mpc512x-fix-resource-printk-format-warning.patch powerpc-wii-fix-resource-printk-format-warnings.patch diff --git a/queue-5.10/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch b/queue-5.10/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch deleted file mode 100644 index 15cfd660121..00000000000 --- a/queue-5.10/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 46ee0486aaf567c7373fccc71805fd84de0fca6f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Apr 2023 17:46:15 +0530 -Subject: spi: bcm63xx: remove PM_SLEEP based conditional compilation - -From: Dhruva Gole - -[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] - -Get rid of conditional compilation based on CONFIG_PM_SLEEP because -it may introduce build issues with certain configs where it maybe disabled -This is because if above config is not enabled the suspend-resume -functions are never part of the code but the bcm63xx_spi_pm_ops struct -still inits them to non-existent suspend-resume functions. - -Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c -index 96d075e633f43..a718ec50957f0 100644 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -626,7 +626,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) - return 0; - } - --#ifdef CONFIG_PM_SLEEP - static int bcm63xx_spi_suspend(struct device *dev) - { - struct spi_master *master = dev_get_drvdata(dev); -@@ -653,7 +652,6 @@ static int bcm63xx_spi_resume(struct device *dev) - - return 0; - } --#endif - - static const struct dev_pm_ops bcm63xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --- -2.39.2 - diff --git a/queue-5.15/series b/queue-5.15/series index 6b01e33199e..4302ec456e5 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -276,7 +276,6 @@ serial-8250-add-missing-wakeup-event-reporting.patch staging-rtl8192e-fix-w_disable-does-not-work-after-s.patch spmi-add-a-check-for-remove-callback-when-removing-a.patch virtio_ring-don-t-update-event-idx-on-get_buf.patch -spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch macintosh-windfarm_smu_sat-add-missing-of_node_put.patch powerpc-mpc512x-fix-resource-printk-format-warning.patch powerpc-wii-fix-resource-printk-format-warnings.patch diff --git a/queue-5.15/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch b/queue-5.15/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch deleted file mode 100644 index 390433834c2..00000000000 --- a/queue-5.15/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0976b334127cc3fa6dfecbb98a0d0ce2f8e45136 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Apr 2023 17:46:15 +0530 -Subject: spi: bcm63xx: remove PM_SLEEP based conditional compilation - -From: Dhruva Gole - -[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] - -Get rid of conditional compilation based on CONFIG_PM_SLEEP because -it may introduce build issues with certain configs where it maybe disabled -This is because if above config is not enabled the suspend-resume -functions are never part of the code but the bcm63xx_spi_pm_ops struct -still inits them to non-existent suspend-resume functions. - -Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c -index 80fa0ef8909ca..0324ab3ce1c84 100644 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -630,7 +630,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) - return 0; - } - --#ifdef CONFIG_PM_SLEEP - static int bcm63xx_spi_suspend(struct device *dev) - { - struct spi_master *master = dev_get_drvdata(dev); -@@ -657,7 +656,6 @@ static int bcm63xx_spi_resume(struct device *dev) - - return 0; - } --#endif - - static const struct dev_pm_ops bcm63xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 32dd310b43e..06d2ff46e66 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -151,7 +151,6 @@ tty-serial-fsl_lpuart-adjust-buffer-length-to-the-in.patch serial-8250-add-missing-wakeup-event-reporting.patch staging-rtl8192e-fix-w_disable-does-not-work-after-s.patch spmi-add-a-check-for-remove-callback-when-removing-a.patch -spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch macintosh-windfarm_smu_sat-add-missing-of_node_put.patch powerpc-mpc512x-fix-resource-printk-format-warning.patch powerpc-wii-fix-resource-printk-format-warnings.patch diff --git a/queue-5.4/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch b/queue-5.4/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch deleted file mode 100644 index c8baeff18fd..00000000000 --- a/queue-5.4/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0b751c26b7553edd5a4c8a85e53ee87ee95192af Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Apr 2023 17:46:15 +0530 -Subject: spi: bcm63xx: remove PM_SLEEP based conditional compilation - -From: Dhruva Gole - -[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] - -Get rid of conditional compilation based on CONFIG_PM_SLEEP because -it may introduce build issues with certain configs where it maybe disabled -This is because if above config is not enabled the suspend-resume -functions are never part of the code but the bcm63xx_spi_pm_ops struct -still inits them to non-existent suspend-resume functions. - -Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c -index fdd7eaa0b8ede..7628987e11a7c 100644 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -614,7 +614,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) - return 0; - } - --#ifdef CONFIG_PM_SLEEP - static int bcm63xx_spi_suspend(struct device *dev) - { - struct spi_master *master = dev_get_drvdata(dev); -@@ -641,7 +640,6 @@ static int bcm63xx_spi_resume(struct device *dev) - - return 0; - } --#endif - - static const struct dev_pm_ops bcm63xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index 5c878d42c65..927b286fc50 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -452,7 +452,6 @@ spi-cadence-quadspi-use-macro-define_simple_dev_pm_o.patch staging-rtl8192e-fix-w_disable-does-not-work-after-s.patch spmi-add-a-check-for-remove-callback-when-removing-a.patch virtio_ring-don-t-update-event-idx-on-get_buf.patch -spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch fbdev-mmp-fix-deferred-clk-handling-in-mmphw_probe.patch selftests-powerpc-pmu-fix-sample-field-check-in-the-.patch macintosh-windfarm_smu_sat-add-missing-of_node_put.patch @@ -609,4 +608,3 @@ i40e-use-int-for-i40e_status.patch drm-amd-display-gcc13-fix-enum-mismatch.patch debugobject-ensure-pool-refill-again.patch scsi-libsas-grab-the-ata-port-lock-in-sas_ata_device_link_abort.patch -spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch diff --git a/queue-6.1/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch b/queue-6.1/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch deleted file mode 100644 index 7816acc9f60..00000000000 --- a/queue-6.1/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 52344eec6844a81f0d914a490c00d5c687e2b6a3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Apr 2023 17:46:15 +0530 -Subject: spi: bcm63xx: remove PM_SLEEP based conditional compilation - -From: Dhruva Gole - -[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] - -Get rid of conditional compilation based on CONFIG_PM_SLEEP because -it may introduce build issues with certain configs where it maybe disabled -This is because if above config is not enabled the suspend-resume -functions are never part of the code but the bcm63xx_spi_pm_ops struct -still inits them to non-existent suspend-resume functions. - -Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c -index 80fa0ef8909ca..0324ab3ce1c84 100644 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -630,7 +630,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) - return 0; - } - --#ifdef CONFIG_PM_SLEEP - static int bcm63xx_spi_suspend(struct device *dev) - { - struct spi_master *master = dev_get_drvdata(dev); -@@ -657,7 +656,6 @@ static int bcm63xx_spi_resume(struct device *dev) - - return 0; - } --#endif - - static const struct dev_pm_ops bcm63xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --- -2.39.2 - diff --git a/queue-6.1/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch b/queue-6.1/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch deleted file mode 100644 index 6dc0ae8565a..00000000000 --- a/queue-6.1/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7 Mon Sep 17 00:00:00 2001 -From: Dhruva Gole -Date: Mon, 24 Apr 2023 15:55:46 +0530 -Subject: spi: bcm63xx: use macro DEFINE_SIMPLE_DEV_PM_OPS - -From: Dhruva Gole - -commit cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7 upstream. - -Using this macro makes the code more readable. -It also inits the members of dev_pm_ops in the following manner -without us explicitly needing to: - -.suspend = bcm63xx_spi_suspend, \ -.resume = bcm63xx_spi_resume, \ -.freeze = bcm63xx_spi_suspend, \ -.thaw = bcm63xx_spi_resume, \ -.poweroff = bcm63xx_spi_suspend, \ -.restore = bcm63xx_spi_resume - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230424102546.1604484-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - drivers/spi/spi-bcm63xx.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -657,9 +657,7 @@ static int bcm63xx_spi_resume(struct dev - return 0; - } - --static const struct dev_pm_ops bcm63xx_spi_pm_ops = { -- SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --}; -+static DEFINE_SIMPLE_DEV_PM_OPS(bcm63xx_spi_pm_ops, bcm63xx_spi_suspend, bcm63xx_spi_resume); - - static struct platform_driver bcm63xx_spi_driver = { - .driver = { diff --git a/queue-6.2/series b/queue-6.2/series index 4a717950580..a487c997ce6 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -497,7 +497,6 @@ spi-cadence-quadspi-use-macro-define_simple_dev_pm_o.patch staging-rtl8192e-fix-w_disable-does-not-work-after-s.patch spmi-add-a-check-for-remove-callback-when-removing-a.patch virtio_ring-don-t-update-event-idx-on-get_buf.patch -spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch fbdev-mmp-fix-deferred-clk-handling-in-mmphw_probe.patch selftests-powerpc-pmu-fix-sample-field-check-in-the-.patch macintosh-windfarm_smu_sat-add-missing-of_node_put.patch @@ -661,4 +660,3 @@ i40e-remove-unused-i40e-status-codes.patch i40e-remove-string-printing-for-i40e_status.patch i40e-use-int-for-i40e_status.patch debugobject-ensure-pool-refill-again.patch -spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch diff --git a/queue-6.2/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch b/queue-6.2/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch deleted file mode 100644 index 0b397e001ed..00000000000 --- a/queue-6.2/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3d0357e403cf3a80962bcf9c641abc758c31b50e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Apr 2023 17:46:15 +0530 -Subject: spi: bcm63xx: remove PM_SLEEP based conditional compilation - -From: Dhruva Gole - -[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] - -Get rid of conditional compilation based on CONFIG_PM_SLEEP because -it may introduce build issues with certain configs where it maybe disabled -This is because if above config is not enabled the suspend-resume -functions are never part of the code but the bcm63xx_spi_pm_ops struct -still inits them to non-existent suspend-resume functions. - -Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c -index 3686d78c44a6d..974c96c27a602 100644 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -629,7 +629,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) - return 0; - } - --#ifdef CONFIG_PM_SLEEP - static int bcm63xx_spi_suspend(struct device *dev) - { - struct spi_master *master = dev_get_drvdata(dev); -@@ -656,7 +655,6 @@ static int bcm63xx_spi_resume(struct device *dev) - - return 0; - } --#endif - - static const struct dev_pm_ops bcm63xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --- -2.39.2 - diff --git a/queue-6.2/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch b/queue-6.2/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch deleted file mode 100644 index cf901be8e58..00000000000 --- a/queue-6.2/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7 Mon Sep 17 00:00:00 2001 -From: Dhruva Gole -Date: Mon, 24 Apr 2023 15:55:46 +0530 -Subject: spi: bcm63xx: use macro DEFINE_SIMPLE_DEV_PM_OPS - -From: Dhruva Gole - -commit cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7 upstream. - -Using this macro makes the code more readable. -It also inits the members of dev_pm_ops in the following manner -without us explicitly needing to: - -.suspend = bcm63xx_spi_suspend, \ -.resume = bcm63xx_spi_resume, \ -.freeze = bcm63xx_spi_suspend, \ -.thaw = bcm63xx_spi_resume, \ -.poweroff = bcm63xx_spi_suspend, \ -.restore = bcm63xx_spi_resume - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230424102546.1604484-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - drivers/spi/spi-bcm63xx.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -656,9 +656,7 @@ static int bcm63xx_spi_resume(struct dev - return 0; - } - --static const struct dev_pm_ops bcm63xx_spi_pm_ops = { -- SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --}; -+static DEFINE_SIMPLE_DEV_PM_OPS(bcm63xx_spi_pm_ops, bcm63xx_spi_suspend, bcm63xx_spi_resume); - - static struct platform_driver bcm63xx_spi_driver = { - .driver = { diff --git a/queue-6.3/series b/queue-6.3/series index 08b95326b5a..b300ff80610 100644 --- a/queue-6.3/series +++ b/queue-6.3/series @@ -552,7 +552,6 @@ staging-rtl8192e-fix-w_disable-does-not-work-after-s.patch spmi-add-a-check-for-remove-callback-when-removing-a.patch vdpa-mlx5-avoid-losing-link-state-updates.patch virtio_ring-don-t-update-event-idx-on-get_buf.patch -spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch fbdev-mmp-fix-deferred-clk-handling-in-mmphw_probe.patch selftests-powerpc-pmu-fix-sample-field-check-in-the-.patch macintosh-windfarm_smu_sat-add-missing-of_node_put.patch @@ -692,4 +691,3 @@ cifs-fix-potential-race-when-tree-connecting-ipc.patch cifs-protect-access-of-tcp_server_info-origin-leaf-_fullpath.patch cifs-avoid-potential-races-when-handling-multiple-dfs-tcons.patch debugobject-ensure-pool-refill-again.patch -spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch diff --git a/queue-6.3/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch b/queue-6.3/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch deleted file mode 100644 index a71a817d989..00000000000 --- a/queue-6.3/spi-bcm63xx-remove-pm_sleep-based-conditional-compil.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 144474a4567761e9df8d0a78af4cba5d7c78ed23 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Apr 2023 17:46:15 +0530 -Subject: spi: bcm63xx: remove PM_SLEEP based conditional compilation - -From: Dhruva Gole - -[ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] - -Get rid of conditional compilation based on CONFIG_PM_SLEEP because -it may introduce build issues with certain configs where it maybe disabled -This is because if above config is not enabled the suspend-resume -functions are never part of the code but the bcm63xx_spi_pm_ops struct -still inits them to non-existent suspend-resume functions. - -Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-bcm63xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c -index 787625ce700cb..d500fcbe2198f 100644 ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -629,7 +629,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) - return 0; - } - --#ifdef CONFIG_PM_SLEEP - static int bcm63xx_spi_suspend(struct device *dev) - { - struct spi_master *master = dev_get_drvdata(dev); -@@ -656,7 +655,6 @@ static int bcm63xx_spi_resume(struct device *dev) - - return 0; - } --#endif - - static const struct dev_pm_ops bcm63xx_spi_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --- -2.39.2 - diff --git a/queue-6.3/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch b/queue-6.3/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch deleted file mode 100644 index cf901be8e58..00000000000 --- a/queue-6.3/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7 Mon Sep 17 00:00:00 2001 -From: Dhruva Gole -Date: Mon, 24 Apr 2023 15:55:46 +0530 -Subject: spi: bcm63xx: use macro DEFINE_SIMPLE_DEV_PM_OPS - -From: Dhruva Gole - -commit cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7 upstream. - -Using this macro makes the code more readable. -It also inits the members of dev_pm_ops in the following manner -without us explicitly needing to: - -.suspend = bcm63xx_spi_suspend, \ -.resume = bcm63xx_spi_resume, \ -.freeze = bcm63xx_spi_suspend, \ -.thaw = bcm63xx_spi_resume, \ -.poweroff = bcm63xx_spi_suspend, \ -.restore = bcm63xx_spi_resume - -Signed-off-by: Dhruva Gole -Link: https://lore.kernel.org/r/20230424102546.1604484-1-d-gole@ti.com -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - drivers/spi/spi-bcm63xx.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -656,9 +656,7 @@ static int bcm63xx_spi_resume(struct dev - return 0; - } - --static const struct dev_pm_ops bcm63xx_spi_pm_ops = { -- SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) --}; -+static DEFINE_SIMPLE_DEV_PM_OPS(bcm63xx_spi_pm_ops, bcm63xx_spi_suspend, bcm63xx_spi_resume); - - static struct platform_driver bcm63xx_spi_driver = { - .driver = {