From: Greg Kroah-Hartman Date: Thu, 7 Sep 2023 09:22:52 +0000 (+0100) Subject: drop queue-6.1/thermal-core-constify-params-in-thermal_zone_device_.patch X-Git-Tag: v6.1.53~153 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1cf130d6226805ac19371ba2c9335b6b1bd3c9f;p=thirdparty%2Fkernel%2Fstable-queue.git 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 e4a674f00e0..f706befd137 100644 --- 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 index 3dee3e3adba..00000000000 --- 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 -Date: Sat, 8 Jul 2023 13:27:19 +0200 -Subject: thermal: core: constify params in thermal_zone_device_register - -From: Ahmad Fatoum - -[ 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 -Acked-by: Daniel Lezcano -Signed-off-by: Rafael J. Wysocki -Signed-off-by: Sasha Levin ---- - 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 -