| Message ID | 2014591.usQuhbGJ8B@rjwysocki.net (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | thermal: Use trip pointers in thermal driver interface | expand |
On 7/29/24 17:06, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > There are no more users of get_thermal_instance(), so drop it. > > While at it, replace get_instance() returning a pointer to struct > thermal_instance with thermal_instance_present() returning a bool > which is more straightforward. > > No functional impact. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/thermal/thermal_core.h | 5 ----- > drivers/thermal/thermal_helpers.c | 30 ++++++------------------------ > 2 files changed, 6 insertions(+), 29 deletions(-) > > Index: linux-pm/drivers/thermal/thermal_core.h > =================================================================== > --- linux-pm.orig/drivers/thermal/thermal_core.h > +++ linux-pm/drivers/thermal/thermal_core.h > @@ -204,11 +204,6 @@ void __thermal_cdev_update(struct therma > > int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip); > > -struct thermal_instance * > -get_thermal_instance(struct thermal_zone_device *tz, > - struct thermal_cooling_device *cdev, > - int trip); > - > /* > * This structure is used to describe the behavior of > * a certain cooling device on a certain trip point > Index: linux-pm/drivers/thermal/thermal_helpers.c > =================================================================== > --- linux-pm.orig/drivers/thermal/thermal_helpers.c > +++ linux-pm/drivers/thermal/thermal_helpers.c > @@ -39,18 +39,18 @@ int get_tz_trend(struct thermal_zone_dev > return trend; > } > > -static struct thermal_instance *get_instance(struct thermal_zone_device *tz, > - struct thermal_cooling_device *cdev, > - const struct thermal_trip *trip) > +static bool thermal_instance_present(struct thermal_zone_device *tz, > + struct thermal_cooling_device *cdev, > + const struct thermal_trip *trip) > { > struct thermal_instance *ti; > > list_for_each_entry(ti, &tz->thermal_instances, tz_node) { > if (ti->trip == trip && ti->cdev == cdev) > - return ti; > + return true; > } > > - return NULL; > + return false; > } > > bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz, > @@ -62,7 +62,7 @@ bool thermal_trip_is_bound_to_cdev(struc > mutex_lock(&tz->lock); > mutex_lock(&cdev->lock); > > - ret = !!get_instance(tz, cdev, trip); > + ret = thermal_instance_present(tz, cdev, trip); > > mutex_unlock(&cdev->lock); > mutex_unlock(&tz->lock); > @@ -71,24 +71,6 @@ bool thermal_trip_is_bound_to_cdev(struc > } > EXPORT_SYMBOL_GPL(thermal_trip_is_bound_to_cdev); > > -struct thermal_instance * > -get_thermal_instance(struct thermal_zone_device *tz, > - struct thermal_cooling_device *cdev, int trip_index) > -{ > - struct thermal_instance *ti; > - > - mutex_lock(&tz->lock); > - mutex_lock(&cdev->lock); > - > - ti = get_instance(tz, cdev, &tz->trips[trip_index].trip); > - > - mutex_unlock(&cdev->lock); > - mutex_unlock(&tz->lock); > - > - return ti; > -} > -EXPORT_SYMBOL(get_thermal_instance); > - > /** > * __thermal_zone_get_temp() - returns the temperature of a thermal zone > * @tz: a valid pointer to a struct thermal_zone_device > > > LGTM, small nit: you can also remove the description of that get_thermal_instance() from Documentation/driver-api/thermal/sysfs-api.rst It sneaked in somehow... Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Index: linux-pm/drivers/thermal/thermal_core.h =================================================================== --- linux-pm.orig/drivers/thermal/thermal_core.h +++ linux-pm/drivers/thermal/thermal_core.h @@ -204,11 +204,6 @@ void __thermal_cdev_update(struct therma int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip); -struct thermal_instance * -get_thermal_instance(struct thermal_zone_device *tz, - struct thermal_cooling_device *cdev, - int trip); - /* * This structure is used to describe the behavior of * a certain cooling device on a certain trip point Index: linux-pm/drivers/thermal/thermal_helpers.c =================================================================== --- linux-pm.orig/drivers/thermal/thermal_helpers.c +++ linux-pm/drivers/thermal/thermal_helpers.c @@ -39,18 +39,18 @@ int get_tz_trend(struct thermal_zone_dev return trend; } -static struct thermal_instance *get_instance(struct thermal_zone_device *tz, - struct thermal_cooling_device *cdev, - const struct thermal_trip *trip) +static bool thermal_instance_present(struct thermal_zone_device *tz, + struct thermal_cooling_device *cdev, + const struct thermal_trip *trip) { struct thermal_instance *ti; list_for_each_entry(ti, &tz->thermal_instances, tz_node) { if (ti->trip == trip && ti->cdev == cdev) - return ti; + return true; } - return NULL; + return false; } bool thermal_trip_is_bound_to_cdev(struct thermal_zone_device *tz, @@ -62,7 +62,7 @@ bool thermal_trip_is_bound_to_cdev(struc mutex_lock(&tz->lock); mutex_lock(&cdev->lock); - ret = !!get_instance(tz, cdev, trip); + ret = thermal_instance_present(tz, cdev, trip); mutex_unlock(&cdev->lock); mutex_unlock(&tz->lock); @@ -71,24 +71,6 @@ bool thermal_trip_is_bound_to_cdev(struc } EXPORT_SYMBOL_GPL(thermal_trip_is_bound_to_cdev); -struct thermal_instance * -get_thermal_instance(struct thermal_zone_device *tz, - struct thermal_cooling_device *cdev, int trip_index) -{ - struct thermal_instance *ti; - - mutex_lock(&tz->lock); - mutex_lock(&cdev->lock); - - ti = get_instance(tz, cdev, &tz->trips[trip_index].trip); - - mutex_unlock(&cdev->lock); - mutex_unlock(&tz->lock); - - return ti; -} -EXPORT_SYMBOL(get_thermal_instance); - /** * __thermal_zone_get_temp() - returns the temperature of a thermal zone * @tz: a valid pointer to a struct thermal_zone_device