Commit f52557ed authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

thermal: netlink: Pass pointers to thermal_notify_tz_trip_up/down()

Instead of requiring the callers of thermal_notify_tz_trip_up/down() to
provide specific values needed to populate struct param in them, make
them extract those values from objects passed by the callers via const
pointers.

No intentional functional impact.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 7e72fc41
...@@ -381,9 +381,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, ...@@ -381,9 +381,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz,
* the threshold and the trip temperature will be equal. * the threshold and the trip temperature will be equal.
*/ */
if (tz->temperature >= trip->temperature) { if (tz->temperature >= trip->temperature) {
thermal_notify_tz_trip_up(tz->id, thermal_notify_tz_trip_up(tz, trip);
thermal_zone_trip_id(tz, trip),
tz->temperature);
trip->threshold = trip->temperature - trip->hysteresis; trip->threshold = trip->temperature - trip->hysteresis;
} else { } else {
trip->threshold = trip->temperature; trip->threshold = trip->temperature;
...@@ -400,9 +398,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, ...@@ -400,9 +398,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz,
* the trip. * the trip.
*/ */
if (tz->temperature < trip->temperature - trip->hysteresis) { if (tz->temperature < trip->temperature - trip->hysteresis) {
thermal_notify_tz_trip_down(tz->id, thermal_notify_tz_trip_down(tz, trip);
thermal_zone_trip_id(tz, trip),
tz->temperature);
trip->threshold = trip->temperature; trip->threshold = trip->temperature;
} else { } else {
trip->threshold = trip->temperature - trip->hysteresis; trip->threshold = trip->temperature - trip->hysteresis;
......
...@@ -346,16 +346,22 @@ int thermal_notify_tz_disable(int tz_id) ...@@ -346,16 +346,22 @@ int thermal_notify_tz_disable(int tz_id)
return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_DISABLE, &p); return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_DISABLE, &p);
} }
int thermal_notify_tz_trip_down(int tz_id, int trip_id, int temp) int thermal_notify_tz_trip_down(const struct thermal_zone_device *tz,
const struct thermal_trip *trip)
{ {
struct param p = { .tz_id = tz_id, .trip_id = trip_id, .temp = temp }; struct param p = { .tz_id = tz->id,
.trip_id = thermal_zone_trip_id(tz, trip),
.temp = tz->temperature };
return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_DOWN, &p); return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_DOWN, &p);
} }
int thermal_notify_tz_trip_up(int tz_id, int trip_id, int temp) int thermal_notify_tz_trip_up(const struct thermal_zone_device *tz,
const struct thermal_trip *trip)
{ {
struct param p = { .tz_id = tz_id, .trip_id = trip_id, .temp = temp }; struct param p = { .tz_id = tz->id,
.trip_id = thermal_zone_trip_id(tz, trip),
.temp = tz->temperature };
return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_UP, &p); return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_UP, &p);
} }
......
...@@ -21,8 +21,10 @@ int thermal_notify_tz_create(int tz_id, const char *name); ...@@ -21,8 +21,10 @@ int thermal_notify_tz_create(int tz_id, const char *name);
int thermal_notify_tz_delete(int tz_id); int thermal_notify_tz_delete(int tz_id);
int thermal_notify_tz_enable(int tz_id); int thermal_notify_tz_enable(int tz_id);
int thermal_notify_tz_disable(int tz_id); int thermal_notify_tz_disable(int tz_id);
int thermal_notify_tz_trip_down(int tz_id, int id, int temp); int thermal_notify_tz_trip_down(const struct thermal_zone_device *tz,
int thermal_notify_tz_trip_up(int tz_id, int id, int temp); const struct thermal_trip *trip);
int thermal_notify_tz_trip_up(const struct thermal_zone_device *tz,
const struct thermal_trip *trip);
int thermal_notify_tz_trip_delete(int tz_id, int id); int thermal_notify_tz_trip_delete(int tz_id, int id);
int thermal_notify_tz_trip_add(int tz_id, int id, int type, int thermal_notify_tz_trip_add(int tz_id, int id, int type,
int temp, int hyst); int temp, int hyst);
...@@ -61,12 +63,14 @@ static inline int thermal_notify_tz_disable(int tz_id) ...@@ -61,12 +63,14 @@ static inline int thermal_notify_tz_disable(int tz_id)
return 0; return 0;
} }
static inline int thermal_notify_tz_trip_down(int tz_id, int id, int temp) static inline int thermal_notify_tz_trip_down(const struct thermal_zone_device *tz,
const struct thermal_trip *trip)
{ {
return 0; return 0;
} }
static inline int thermal_notify_tz_trip_up(int tz_id, int id, int temp) static inline int thermal_notify_tz_trip_up(const struct thermal_zone_device *tz,
const struct thermal_trip *trip)
{ {
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment