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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index fa88d870724166b9203fcb8c42ce92811423e1f4..a7e2008d34c9b2ad6df26df6aeba92e23edb641f 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -381,9 +381,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz,
                 * the threshold and the trip temperature will be equal.
                 */
                if (tz->temperature >= trip->temperature) {
-                       thermal_notify_tz_trip_up(tz->id,
-                                                 thermal_zone_trip_id(tz, trip),
-                                                 tz->temperature);
+                       thermal_notify_tz_trip_up(tz, trip);
                        trip->threshold = trip->temperature - trip->hysteresis;
                } else {
                        trip->threshold = trip->temperature;
@@ -400,9 +398,7 @@ static void handle_thermal_trip(struct thermal_zone_device *tz,
                 * the trip.
                 */
                if (tz->temperature < trip->temperature - trip->hysteresis) {
-                       thermal_notify_tz_trip_down(tz->id,
-                                                   thermal_zone_trip_id(tz, trip),
-                                                   tz->temperature);
+                       thermal_notify_tz_trip_down(tz, trip);
                        trip->threshold = trip->temperature;
                } else {
                        trip->threshold = trip->temperature - trip->hysteresis;

diff --git a/drivers/thermal/thermal_netlink.c b/drivers/thermal/thermal_netlink.c
index 4a2c299c04626e4827ef0b275c4e0703a3f5d458..46e4ea45d67dcb13a2d76adf447d72da284c670a 100644 (file)
--- a/drivers/thermal/thermal_netlink.c
+++ b/drivers/thermal/thermal_netlink.c
@@ -346,16 +346,22 @@ int thermal_notify_tz_disable(int tz_id)
        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);
 }
 
-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);
 }

diff --git a/drivers/thermal/thermal_netlink.h b/drivers/thermal/thermal_netlink.h
index bb4c47d685e3c82c2507ab5d5103d9f9301efc92..907dc88d33170ee7f63d3c7cc9a30c73f55be499 100644 (file)
--- a/drivers/thermal/thermal_netlink.h
+++ b/drivers/thermal/thermal_netlink.h
@@ -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_enable(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_up(int tz_id, int id, int temp);
+int thermal_notify_tz_trip_down(const struct thermal_zone_device *tz,
+                               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_add(int tz_id, int id, int type,
                               int temp, int hyst);
@@ -61,12 +63,14 @@ static inline int thermal_notify_tz_disable(int tz_id)
        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;
 }
 
-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;
 }