4.14-stable patches

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

diff --git a/queue-4.14/series b/queue-4.14/series
index 17b4b0a3b313bc60db49ed5ba8d801ac3bdf8b90..3b22d1d62c54ccf45e0310cc2ad01cb0027dc062 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -81,3 +81,4 @@ dm-integrity-call-kmem_cache_destroy-in-dm_integrity_init-error-path.patch
 dm-flakey-fix-a-crash-with-invalid-table-line.patch
 dm-ioctl-fix-nested-locking-in-table_clear-to-remove-deadlock-concern.patch
 perf-auxtrace-fix-address-filter-entire-kernel-size.patch
+spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch

diff --git a/queue-4.14/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch b/queue-4.14/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch
new file mode 100644 (file)
index 0000000..0f11ce3
--- /dev/null
+++ b/queue-4.14/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
+@@ -652,9 +652,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 = {