2022-07-08 18:51:38

by Daniel Lezcano

Subject: [PATCH v2 1/3] thermal/core: Encapsulate the trip point crossed function

The routine where the trip point crossed is detected is a strategic
place where different processing will happen. Encapsulate the code in
a function, so all specific actions related with a trip point crossed
can be grouped.

Signed-off-by: Daniel Lezcano <[email protected]>
---
drivers/thermal/thermal_core.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index cdc0552e8c42..d9f771b15ed8 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -358,6 +358,25 @@ static void handle_critical_trips(struct thermal_zone_device *tz,
tz->ops->critical(tz);
}

+static void handle_thermal_trip_crossed(struct thermal_zone_device *tz, int trip,
+ int trip_temp, int trip_hyst, enum thermal_trip_type trip_type)
+{
+ if (tz->last_temperature == THERMAL_TEMP_INVALID)
+ return;
+
+ if (tz->last_temperature < trip_temp &&
+ tz->temperature >= trip_temp) {
+ thermal_notify_tz_trip_up(tz->id, trip,
+ tz->temperature);
+ }
+
+ if (tz->last_temperature >= trip_temp &&
+ tz->temperature < (trip_temp - trip_hyst)) {
+ thermal_notify_tz_trip_down(tz->id, trip,
+ tz->temperature);
+ }
+}
+
static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
{
enum thermal_trip_type type;
@@ -372,16 +391,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
if (tz->ops->get_trip_hyst)
tz->ops->get_trip_hyst(tz, trip, &hyst);

- if (tz->last_temperature != THERMAL_TEMP_INVALID) {
- if (tz->last_temperature < trip_temp &&
- tz->temperature >= trip_temp)
- thermal_notify_tz_trip_up(tz->id, trip,
- tz->temperature);
- if (tz->last_temperature >= trip_temp &&
- tz->temperature < (trip_temp - hyst))
- thermal_notify_tz_trip_down(tz->id, trip,
- tz->temperature);
- }
+ handle_thermal_trip_crossed(tz, trip, trip_temp, hyst, type);

if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)
handle_critical_trips(tz, trip, type);
--
2.25.1

2022-07-12 11:11:02

by Daniel Lezcano

Subject: Re: [PATCH v2 1/3] thermal/core: Encapsulate the trip point crossed function

On 08/07/2022 20:32, Daniel Lezcano wrote:
> The routine where the trip point crossed is detected is a strategic
> place where different processing will happen. Encapsulate the code in
> a function, so all specific actions related with a trip point crossed
> can be grouped.
>
> Signed-off-by: Daniel Lezcano <[email protected]>
> ---

Is it ok if I pick this series?


--
<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

2022-07-12 11:16:49

by Lukasz Luba

Subject: Re: [PATCH v2 1/3] thermal/core: Encapsulate the trip point crossed function

On 7/8/22 19:32, Daniel Lezcano wrote:
> The routine where the trip point crossed is detected is a strategic
> place where different processing will happen. Encapsulate the code in
> a function, so all specific actions related with a trip point crossed
> can be grouped.
>
> Signed-off-by: Daniel Lezcano <[email protected]>
> ---
> drivers/thermal/thermal_core.c | 30 ++++++++++++++++++++----------
> 1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index cdc0552e8c42..d9f771b15ed8 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -358,6 +358,25 @@ static void handle_critical_trips(struct thermal_zone_device *tz,
> tz->ops->critical(tz);
> }
>
> +static void handle_thermal_trip_crossed(struct thermal_zone_device *tz, int trip,
> + int trip_temp, int trip_hyst, enum thermal_trip_type trip_type)
> +{
> + if (tz->last_temperature == THERMAL_TEMP_INVALID)
> + return;
> +
> + if (tz->last_temperature < trip_temp &&
> + tz->temperature >= trip_temp) {
> + thermal_notify_tz_trip_up(tz->id, trip,
> + tz->temperature);
> + }
> +
> + if (tz->last_temperature >= trip_temp &&
> + tz->temperature < (trip_temp - trip_hyst)) {
> + thermal_notify_tz_trip_down(tz->id, trip,
> + tz->temperature);
> + }
> +}
> +
> static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
> {
> enum thermal_trip_type type;
> @@ -372,16 +391,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
> if (tz->ops->get_trip_hyst)
> tz->ops->get_trip_hyst(tz, trip, &hyst);
>
> - if (tz->last_temperature != THERMAL_TEMP_INVALID) {
> - if (tz->last_temperature < trip_temp &&
> - tz->temperature >= trip_temp)
> - thermal_notify_tz_trip_up(tz->id, trip,
> - tz->temperature);
> - if (tz->last_temperature >= trip_temp &&
> - tz->temperature < (trip_temp - hyst))
> - thermal_notify_tz_trip_down(tz->id, trip,
> - tz->temperature);
> - }
> + handle_thermal_trip_crossed(tz, trip, trip_temp, hyst, type);
>
> if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)
> handle_critical_trips(tz, trip, type);


LGTM

Reviewed-by: Lukasz Luba <[email protected]>