drop spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch from a bunch of places

diff --git a/queue-4.14/series b/queue-4.14/series
index 3b22d1d62c54ccf45e0310cc2ad01cb0027dc062..17b4b0a3b313bc60db49ed5ba8d801ac3bdf8b90 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -81,4 +81,3 @@ 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
deleted file mode 100644 (file)
index 0f11ce3..0000000
--- a/queue-4.14/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 <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 = {

diff --git a/queue-4.19/series b/queue-4.19/series
index 31f3bd01c37a417a28cb7f8c34e154ad36494bb5..7fc16360b13d7bb11d3fffa70d3f8d9f66c36fd7 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -136,4 +136,3 @@ 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
 debugobject-ensure-pool-refill-again.patch
-spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch

diff --git a/queue-4.19/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch b/queue-4.19/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch
deleted file mode 100644 (file)
index 0f11ce3..0000000
--- a/queue-4.19/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 <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 = {

diff --git a/queue-5.10/series b/queue-5.10/series
index ba1608d3c8724d57c7f47e476acac94a0bd1d8a5..6503592e2eeeb7cf58efb281fd651c8efe37b54c 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -293,4 +293,3 @@ 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
 scsi-target-core-avoid-smp_processor_id-in-preemptible-code.patch
-spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch

diff --git a/queue-5.10/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch b/queue-5.10/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch
deleted file mode 100644 (file)
index d8f192b..0000000
--- a/queue-5.10/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 <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
-@@ -653,9 +653,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-5.15/series b/queue-5.15/series
index ab3318f7b0ea662bf6a2755e43d0b4240ba14f68..6b01e33199edff6f4e43bd0c97f6eba472d431d4 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -369,4 +369,3 @@ 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
deleted file mode 100644 (file)
index 6dc0ae8..0000000
--- a/queue-5.15/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 <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 = {

diff --git a/queue-5.4/series b/queue-5.4/series
index 8469d0f1002853c695a5ce1fac93890825bc1204..32dd310b43ef0dc3323f0b025a2d7ee43badbd7e 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -209,4 +209,3 @@ dm-ioctl-fix-nested-locking-in-table_clear-to-remove-deadlock-concern.patch
 perf-auxtrace-fix-address-filter-entire-kernel-size.patch
 perf-intel-pt-fix-cyc-timestamps-after-standalone-cbr.patch
 debugobject-ensure-pool-refill-again.patch
-spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch

diff --git a/queue-5.4/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch b/queue-5.4/spi-bcm63xx-use-macro-define_simple_dev_pm_ops.patch
deleted file mode 100644 (file)
index 0a6229e..0000000
--- a/queue-5.4/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 <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
-@@ -641,9 +641,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 = {