drop queue-6.1/thermal-core-constify-params-in-thermal_zone_device_.patch

Broke the build

diff --git a/queue-6.1/series b/queue-6.1/series
index e4a674f00e0a79b90948be7c3247a9d634ffeba4..f706befd13704e14363479f839c2e133d27b2c93 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -20,7 +20,6 @@ ksmbd-fix-out-of-bounds-in-init_smb2_rsp_hdr.patch
 asoc-da7219-flush-pending-aad-irq-when-suspending.patch
 asoc-da7219-check-for-failure-reading-aad-irq-events.patch
 asoc-nau8821-add-dmi-quirk-mechanism-for-active-high.patch
-thermal-core-constify-params-in-thermal_zone_device_.patch
 ethernet-atheros-fix-return-value-check-in-atl1c_tso.patch
 m68k-fix-invalid-.section-syntax.patch
 s390-dasd-use-correct-number-of-retries-for-erp-requ.patch

diff --git a/queue-6.1/thermal-core-constify-params-in-thermal_zone_device_.patch b/queue-6.1/thermal-core-constify-params-in-thermal_zone_device_.patch
deleted file mode 100644 (file)
index 3dee3e3..0000000
--- a/queue-6.1/thermal-core-constify-params-in-thermal_zone_device_.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 31a88a958cf048c35fab90f3164189989d88d723 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 8 Jul 2023 13:27:19 +0200
-Subject: thermal: core: constify params in thermal_zone_device_register
-
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-
-[ Upstream commit 80ddce5f2dbd0e83eadc9f9d373439180d599fe5 ]
-
-Since commit 3d439b1a2ad3 ("thermal/core: Alloc-copy-free the thermal zone
-parameters structure"), thermal_zone_device_register() allocates a copy
-of the tzp argument and callers need not explicitly manage its lifetime.
-
-This means the function no longer cares about the parameter being
-mutable, so constify it.
-
-No functional change.
-
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/thermal/thermal_core.c | 4 ++--
- include/linux/thermal.h        | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
-index 1eae4ec719a8f..2d5085488733e 100644
---- a/drivers/thermal/thermal_core.c
-+++ b/drivers/thermal/thermal_core.c
-@@ -1178,7 +1178,7 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms
- struct thermal_zone_device *
- thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *trips, int num_trips, int mask,
-                                       void *devdata, struct thermal_zone_device_ops *ops,
--                                      struct thermal_zone_params *tzp, int passive_delay,
-+                                      const struct thermal_zone_params *tzp, int passive_delay,
-                                       int polling_delay)
- {
-       struct thermal_zone_device *tz;
-@@ -1335,7 +1335,7 @@ EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);
- 
- struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask,
-                                                        void *devdata, struct thermal_zone_device_ops *ops,
--                                                       struct thermal_zone_params *tzp, int passive_delay,
-+                                                       const struct thermal_zone_params *tzp, int passive_delay,
-                                                        int polling_delay)
- {
-       return thermal_zone_device_register_with_trips(type, NULL, ntrips, mask,
-diff --git a/include/linux/thermal.h b/include/linux/thermal.h
-index 5e093602e8fcd..a339d3af9f9f4 100644
---- a/include/linux/thermal.h
-+++ b/include/linux/thermal.h
-@@ -337,14 +337,14 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev,
- #ifdef CONFIG_THERMAL
- struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
-               void *, struct thermal_zone_device_ops *,
--              struct thermal_zone_params *, int, int);
-+              const struct thermal_zone_params *, int, int);
- 
- void thermal_zone_device_unregister(struct thermal_zone_device *);
- 
- struct thermal_zone_device *
- thermal_zone_device_register_with_trips(const char *, struct thermal_trip *, int, int,
-                                       void *, struct thermal_zone_device_ops *,
--                                      struct thermal_zone_params *, int, int);
-+                                      const struct thermal_zone_params *, int, int);
- 
- int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
-                                    struct thermal_cooling_device *,
-@@ -378,7 +378,7 @@ void thermal_zone_device_critical(struct thermal_zone_device *tz);
- static inline struct thermal_zone_device *thermal_zone_device_register(
-       const char *type, int trips, int mask, void *devdata,
-       struct thermal_zone_device_ops *ops,
--      struct thermal_zone_params *tzp,
-+      const struct thermal_zone_params *tzp,
-       int passive_delay, int polling_delay)
- { return ERR_PTR(-ENODEV); }
- static inline void thermal_zone_device_unregister(
--- 
-2.40.1
-