diff mbox series

[v1,3/6] thermal: netlink: Pass pointers to thermal_notify_tz_trip_up/down()

Message ID 3295756.44csPzL39Z@kreacher
State New
Headers
Series thermal: netlink: Redefine the API and drop unused code |

Commit Message

Rafael J. Wysocki Dec. 15, 2023, 7:57 p.m. UTC 
  From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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>
---
 drivers/thermal/thermal_core.c    |    8 ++------
 drivers/thermal/thermal_netlink.c |   14 ++++++++++----
 drivers/thermal/thermal_netlink.h |   12 ++++++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

Comments

Lukasz Luba Jan. 3, 2024, 8 p.m. UTC | #1 
On 12/15/23 19:57, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> 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>
> ---
>   drivers/thermal/thermal_core.c    |    8 ++------
>   drivers/thermal/thermal_netlink.c |   14 ++++++++++----
>   drivers/thermal/thermal_netlink.h |   12 ++++++++----
>   3 files changed, 20 insertions(+), 14 deletions(-)
> 
> Index: linux-pm/drivers/thermal/thermal_core.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_core.c
> +++ linux-pm/drivers/thermal/thermal_core.c
> @@ -361,9 +361,7 @@ static void handle_thermal_trip(struct t
>   		 * 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;
> @@ -380,9 +378,7 @@ static void handle_thermal_trip(struct t
>   		 * 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;
> Index: linux-pm/drivers/thermal/thermal_netlink.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_netlink.c
> +++ linux-pm/drivers/thermal/thermal_netlink.c
> @@ -330,16 +330,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);
>   }
> Index: linux-pm/drivers/thermal/thermal_netlink.h
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_netlink.h
> +++ linux-pm/drivers/thermal/thermal_netlink.h
> @@ -18,8 +18,10 @@ int thermal_notify_tz_create(int tz_id,
>   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);
> @@ -58,12 +60,14 @@ static inline int thermal_notify_tz_disa
>   	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;
>   }
> 
> 
> 

Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Daniel Lezcano Jan. 9, 2024, 11:28 a.m. UTC | #2 
On 15/12/2023 20:57, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> 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: Daniel Lezcano <daniel.lezcano@linaro.org>
diff mbox series

Patch

Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -361,9 +361,7 @@  static void handle_thermal_trip(struct t
 		 * 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;
@@ -380,9 +378,7 @@  static void handle_thermal_trip(struct t
 		 * 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;
Index: linux-pm/drivers/thermal/thermal_netlink.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_netlink.c
+++ linux-pm/drivers/thermal/thermal_netlink.c
@@ -330,16 +330,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);
 }
Index: linux-pm/drivers/thermal/thermal_netlink.h
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_netlink.h
+++ linux-pm/drivers/thermal/thermal_netlink.h
@@ -18,8 +18,10 @@  int thermal_notify_tz_create(int tz_id,
 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);
@@ -58,12 +60,14 @@  static inline int thermal_notify_tz_disa
 	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;
 }