5.15-stable patches

added patches:
	spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch

diff --git a/queue-5.15/arm64-dts-qcom-sdm845-correct-dynamic-power-coefficients.patch b/queue-5.15/arm64-dts-qcom-sdm845-correct-dynamic-power-coefficients.patch
index 80687d05ab8e5198c14047acc004a348a9a4c984..11bbb50c4fe99acd63f42b6fe9459b881cdc9cfd 100644 (file)
--- a/queue-5.15/arm64-dts-qcom-sdm845-correct-dynamic-power-coefficients.patch
+++ b/queue-5.15/arm64-dts-qcom-sdm845-correct-dynamic-power-coefficients.patch
@@ -1,7 +1,7 @@
 From 44750f153699b6e4f851a399287e5c8df208d696 Mon Sep 17 00:00:00 2001
 From: Vincent Guittot <vincent.guittot@linaro.org>
 Date: Fri, 6 Jan 2023 17:46:18 +0100
-Subject: arm64: dts: qcom: sdm845: correct dynamic power coefficients
+Subject: arm64: dts: qcom: sdm845: correct dynamic power coefficients - again
 
 From: Vincent Guittot <vincent.guittot@linaro.org>
 

diff --git a/queue-5.15/series b/queue-5.15/series
index 6b01e33199edff6f4e43bd0c97f6eba472d431d4..ab3318f7b0ea662bf6a2755e43d0b4240ba14f68 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -369,3 +369,4 @@ perf-intel-pt-fix-cyc-timestamps-after-standalone-cbr.patch
 debugobject-ensure-pool-refill-again.patch
 sound-oss-dmasound-fix-dmasound_setup-defined-but-not-used.patch
 arm64-dts-qcom-sdm845-correct-dynamic-power-coefficients.patch
+spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch

diff --git a/queue-5.15/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch b/queue-5.15/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch
new file mode 100644 (file)
index 0000000..6dc0ae8
--- /dev/null
+++ b/queue-5.15/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch
@@ -0,0 +1,41 @@
+From cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7 Mon Sep 17 00:00:00 2001
+From: Dhruva Gole <d-gole@ti.com>
+Date: Mon, 24 Apr 2023 15:55:46 +0530
+Subject: spi: bcm63xx: use macro DEFINE_SIMPLE_DEV_PM_OPS
+
+From: Dhruva Gole <d-gole@ti.com>
+
+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 <d-gole@ti.com>
+Link: https://lore.kernel.org/r/20230424102546.1604484-1-d-gole@ti.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 = {