thermal: netlink: Pass pointers to thermal_notify_tz_trip_change()

Instead of requiring the caller of thermal_notify_tz_trip_change() to
provide specific values needed to populate struct param in it, make it
extract those values from objects passed to it by the caller 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_netlink.c b/drivers/thermal/thermal_netlink.c
index 332052e24a86c07a7b3af1f9a5c280d08b6374a8..4a2c299c04626e4827ef0b275c4e0703a3f5d458 100644 (file)
--- a/drivers/thermal/thermal_netlink.c
+++ b/drivers/thermal/thermal_netlink.c
@@ -377,12 +377,14 @@ int thermal_notify_tz_trip_delete(int tz_id, int trip_id)
        return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_DELETE, &p);
 }
 
-int thermal_notify_tz_trip_change(int tz_id, int trip_id, int trip_type,
-                                 int trip_temp, int trip_hyst)
-{
-       struct param p = { .tz_id = tz_id, .trip_id = trip_id,
-                          .trip_type = trip_type, .trip_temp = trip_temp,
-                          .trip_hyst = trip_hyst };
+int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz,
+                                 const struct thermal_trip *trip)
+{
+       struct param p = { .tz_id = tz->id,
+                          .trip_id = thermal_zone_trip_id(tz, trip),
+                          .trip_type = trip->type,
+                          .trip_temp = trip->temperature,
+                          .trip_hyst = trip->hysteresis };
 
        return thermal_genl_send_event(THERMAL_GENL_EVENT_TZ_TRIP_CHANGE, &p);
 }

diff --git a/drivers/thermal/thermal_netlink.h b/drivers/thermal/thermal_netlink.h
index 0a9987c3bc5787643f79b4e73e96ed39b4dbe21e..bb4c47d685e3c82c2507ab5d5103d9f9301efc92 100644 (file)
--- a/drivers/thermal/thermal_netlink.h
+++ b/drivers/thermal/thermal_netlink.h
@@ -10,6 +10,9 @@ struct thermal_genl_cpu_caps {
        int efficiency;
 };
 
+struct thermal_zone_device;
+struct thermal_trip;
+
 /* Netlink notification function */
 #ifdef CONFIG_THERMAL_NETLINK
 int __init thermal_netlink_init(void);
@@ -23,8 +26,8 @@ int thermal_notify_tz_trip_up(int tz_id, int id, int temp);
 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);
-int thermal_notify_tz_trip_change(int tz_id, int id, int type,
-                                 int temp, int hyst);
+int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz,
+                                 const struct thermal_trip *trip);
 int thermal_notify_cdev_state_update(int cdev_id, int state);
 int thermal_notify_cdev_add(int cdev_id, const char *name, int max_state);
 int thermal_notify_cdev_delete(int cdev_id);
@@ -79,8 +82,8 @@ static inline int thermal_notify_tz_trip_add(int tz_id, int id, int type,
        return 0;
 }
 
-static inline int thermal_notify_tz_trip_change(int tz_id, int id, int type,
-                                               int temp, int hyst)
+static inline int thermal_notify_tz_trip_change(const struct thermal_zone_device *tz,
+                                               const struct thermal_trip *trip)
 {
        return 0;
 }

diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
index 8bffa1e5e2063fe96d2666124f1ebb4a2c2f8c53..c875a26d5adf41816a1798fdf14d1fd490141e75 100644 (file)
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -155,9 +155,7 @@ int thermal_zone_trip_id(const struct thermal_zone_device *tz,
 void thermal_zone_trip_updated(struct thermal_zone_device *tz,
                               const struct thermal_trip *trip)
 {
-       thermal_notify_tz_trip_change(tz->id, thermal_zone_trip_id(tz, trip),
-                                     trip->type, trip->temperature,
-                                     trip->hysteresis);
+       thermal_notify_tz_trip_change(tz, trip);
        __thermal_zone_device_update(tz, THERMAL_TRIP_CHANGED);
 }
 
@@ -168,8 +166,6 @@ void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,
                return;
 
        trip->temperature = temp;
-       thermal_notify_tz_trip_change(tz->id, thermal_zone_trip_id(tz, trip),
-                                     trip->type, trip->temperature,
-                                     trip->hysteresis);
+       thermal_notify_tz_trip_change(tz, trip);
 }
 EXPORT_SYMBOL_GPL(thermal_zone_set_trip_temp);