On 06/09/2022 18:47, Daniel Lezcano wrote:
> Replace a single call to thermal_zone_get_trip() to get a trip point
> instead of calling the different ops->get_trip*
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Any comment on this patch ?
> ---
> drivers/thermal/tegra/soctherm.c | 33 +++++++++++--------------
> drivers/thermal/tegra/tegra30-tsensor.c | 17 ++++++-------
> 2 files changed, 22 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c
> index 1efe470f31e9..96b541458ccd 100644
> --- a/drivers/thermal/tegra/soctherm.c
> +++ b/drivers/thermal/tegra/soctherm.c
> @@ -582,23 +582,23 @@ static int tsensor_group_thermtrip_get(struct tegra_soctherm *ts, int id)
> return temp;
> }
>
> -static int tegra_thermctl_set_trip_temp(struct thermal_zone_device *tz, int trip, int temp)
> +static int tegra_thermctl_set_trip_temp(struct thermal_zone_device *tz, int trip_id, int temp)
> {
> struct tegra_thermctl_zone *zone = tz->devdata;
> struct tegra_soctherm *ts = zone->ts;
> + struct thermal_trip trip;
> const struct tegra_tsensor_group *sg = zone->sg;
> struct device *dev = zone->dev;
> - enum thermal_trip_type type;
> int ret;
>
> if (!tz)
> return -EINVAL;
>
> - ret = tz->ops->get_trip_type(tz, trip, &type);
> + ret = thermal_zone_get_trip(tz, trip_id, &trip);
> if (ret)
> return ret;
>
> - if (type == THERMAL_TRIP_CRITICAL) {
> + if (trip.type == THERMAL_TRIP_CRITICAL) {
> /*
> * If thermtrips property is set in DT,
> * doesn't need to program critical type trip to HW,
> @@ -609,7 +609,7 @@ static int tegra_thermctl_set_trip_temp(struct thermal_zone_device *tz, int trip
> else
> return 0;
>
> - } else if (type == THERMAL_TRIP_HOT) {
> + } else if (trip.type == THERMAL_TRIP_HOT) {
> int i;
>
> for (i = 0; i < THROTTLE_SIZE; i++) {
> @@ -620,7 +620,7 @@ static int tegra_thermctl_set_trip_temp(struct thermal_zone_device *tz, int trip
> continue;
>
> cdev = ts->throt_cfgs[i].cdev;
> - if (get_thermal_instance(tz, cdev, trip))
> + if (get_thermal_instance(tz, cdev, trip_id))
> stc = find_throttle_cfg_by_name(ts, cdev->type);
> else
> continue;
> @@ -687,25 +687,20 @@ static const struct thermal_zone_device_ops tegra_of_thermal_ops = {
> .set_trips = tegra_thermctl_set_trips,
> };
>
> -static int get_hot_temp(struct thermal_zone_device *tz, int *trip, int *temp)
> +static int get_hot_temp(struct thermal_zone_device *tz, int *trip_id, int *temp)
> {
> - int ntrips, i, ret;
> - enum thermal_trip_type type;
> + int i, ret;
> + struct thermal_trip trip;
>
> - ntrips = of_thermal_get_ntrips(tz);
> - if (ntrips <= 0)
> - return -EINVAL;
> + for (i = 0; i < thermal_zone_get_num_trips(tz); i++) {
>
> - for (i = 0; i < ntrips; i++) {
> - ret = tz->ops->get_trip_type(tz, i, &type);
> + ret = thermal_zone_get_trip(tz, i, &trip);
> if (ret)
> return -EINVAL;
> - if (type == THERMAL_TRIP_HOT) {
> - ret = tz->ops->get_trip_temp(tz, i, temp);
> - if (!ret)
> - *trip = i;
>
> - return ret;
> + if (trip.type == THERMAL_TRIP_HOT) {
> + *trip_id = i;
> + return 0;
> }
> }
>
> diff --git a/drivers/thermal/tegra/tegra30-tsensor.c b/drivers/thermal/tegra/tegra30-tsensor.c
> index c34501287e96..cbaad2245f1d 100644
> --- a/drivers/thermal/tegra/tegra30-tsensor.c
> +++ b/drivers/thermal/tegra/tegra30-tsensor.c
> @@ -316,18 +316,17 @@ static void tegra_tsensor_get_hw_channel_trips(struct thermal_zone_device *tzd,
> *hot_trip = 85000;
> *crit_trip = 90000;
>
> - for (i = 0; i < tzd->num_trips; i++) {
> - enum thermal_trip_type type;
> - int trip_temp;
> + for (i = 0; i < thermal_zone_get_num_trips(tzd); i++) {
>
> - tzd->ops->get_trip_temp(tzd, i, &trip_temp);
> - tzd->ops->get_trip_type(tzd, i, &type);
> + struct thermal_trip trip;
>
> - if (type == THERMAL_TRIP_HOT)
> - *hot_trip = trip_temp;
> + thermal_zone_get_trip(tzd, i, &trip);
> +
> + if (trip.type == THERMAL_TRIP_HOT)
> + *hot_trip = trip.temperature;
>
> - if (type == THERMAL_TRIP_CRITICAL)
> - *crit_trip = trip_temp;
> + if (trip.type == THERMAL_TRIP_CRITICAL)
> + *crit_trip = trip.temperature;
> }
>
> /* clamp hardware trips to the calibration limits */
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog