| Message ID | 7586518.EvYhyI6sBW@kreacher (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | thermal: Improve iteration over trip points | expand |
On 03/10/2023 15:25, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Because thermal_zone_device_exec() has no users any more and there are > no plans to use it anywhere, revert commit 9a99a996d1ec ("thermal: core: > Introduce thermal_zone_device_exec()") that introduced it. > > No functional impact. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > > v1 -> v2: No changes > > --- > drivers/thermal/thermal_core.c | 19 ------------------- > include/linux/thermal.h | 4 ---- > 2 files changed, 23 deletions(-) > > Index: linux-pm/drivers/thermal/thermal_core.c > =================================================================== > --- linux-pm.orig/drivers/thermal/thermal_core.c > +++ linux-pm/drivers/thermal/thermal_core.c > @@ -493,25 +493,6 @@ void thermal_zone_device_update(struct t > } > EXPORT_SYMBOL_GPL(thermal_zone_device_update); > > -/** > - * thermal_zone_device_exec - Run a callback under the zone lock. > - * @tz: Thermal zone. > - * @cb: Callback to run. > - * @data: Data to pass to the callback. > - */ > -void thermal_zone_device_exec(struct thermal_zone_device *tz, > - void (*cb)(struct thermal_zone_device *, > - unsigned long), > - unsigned long data) > -{ > - mutex_lock(&tz->lock); > - > - cb(tz, data); > - > - mutex_unlock(&tz->lock); > -} > -EXPORT_SYMBOL_GPL(thermal_zone_device_exec); > - > static void thermal_zone_device_check(struct work_struct *work) > { > struct thermal_zone_device *tz = container_of(work, struct > Index: linux-pm/include/linux/thermal.h > =================================================================== > --- linux-pm.orig/include/linux/thermal.h > +++ linux-pm/include/linux/thermal.h > @@ -340,10 +340,6 @@ int thermal_zone_unbind_cooling_device(s > struct thermal_cooling_device *); > void thermal_zone_device_update(struct thermal_zone_device *, > enum thermal_notify_event); > -void thermal_zone_device_exec(struct thermal_zone_device *tz, > - void (*cb)(struct thermal_zone_device *, > - unsigned long), > - unsigned long data); > > struct thermal_cooling_device *thermal_cooling_device_register(const char *, > void *, const struct thermal_cooling_device_ops *); > > >
Index: linux-pm/drivers/thermal/thermal_core.c =================================================================== --- linux-pm.orig/drivers/thermal/thermal_core.c +++ linux-pm/drivers/thermal/thermal_core.c @@ -493,25 +493,6 @@ void thermal_zone_device_update(struct t } EXPORT_SYMBOL_GPL(thermal_zone_device_update); -/** - * thermal_zone_device_exec - Run a callback under the zone lock. - * @tz: Thermal zone. - * @cb: Callback to run. - * @data: Data to pass to the callback. - */ -void thermal_zone_device_exec(struct thermal_zone_device *tz, - void (*cb)(struct thermal_zone_device *, - unsigned long), - unsigned long data) -{ - mutex_lock(&tz->lock); - - cb(tz, data); - - mutex_unlock(&tz->lock); -} -EXPORT_SYMBOL_GPL(thermal_zone_device_exec); - static void thermal_zone_device_check(struct work_struct *work) { struct thermal_zone_device *tz = container_of(work, struct Index: linux-pm/include/linux/thermal.h =================================================================== --- linux-pm.orig/include/linux/thermal.h +++ linux-pm/include/linux/thermal.h @@ -340,10 +340,6 @@ int thermal_zone_unbind_cooling_device(s struct thermal_cooling_device *); void thermal_zone_device_update(struct thermal_zone_device *, enum thermal_notify_event); -void thermal_zone_device_exec(struct thermal_zone_device *tz, - void (*cb)(struct thermal_zone_device *, - unsigned long), - unsigned long data); struct thermal_cooling_device *thermal_cooling_device_register(const char *, void *, const struct thermal_cooling_device_ops *);