[PATCH v2 12/12] thermal: core: Pass trip descriptors to trip bind/unbind functions

Posted by Rafael J. Wysocki 1 month, 3 weeks ago

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

The code is somewhat cleaner if struct thermal_trip_desc pointers are
passed to thermal_bind_cdev_to_trip(), thermal_unbind_cdev_from_trip(),
and print_bind_err_msg() instead of struct thermal_trip pointers, so
modify it accordingly.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

This is a new iteration of

https://lore.kernel.org/linux-pm/2954063.e9J7NaK4W3@rjwysocki.net/

v1 -> v2: Rebase and drop the leftover Subject: field from the preamble.

---
 drivers/thermal/thermal_core.c |   27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -757,9 +757,9 @@ struct thermal_zone_device *thermal_zone
 /**
  * thermal_bind_cdev_to_trip - bind a cooling device to a thermal zone
  * @tz:		pointer to struct thermal_zone_device
- * @trip:	trip point the cooling devices is associated with in this zone.
+ * @td:		descriptor of the trip point to bind @cdev to
  * @cdev:	pointer to struct thermal_cooling_device
- * @cool_spec:	cooling specification for @trip and @cdev
+ * @cool_spec:	cooling specification for the trip point and @cdev
  *
  * This interface function bind a thermal cooling device to the certain trip
  * point of a thermal zone device.
@@ -768,11 +768,10 @@ struct thermal_zone_device *thermal_zone
  * Return: 0 on success, the proper error value otherwise.
  */
 static int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,
-				     struct thermal_trip *trip,
+				     struct thermal_trip_desc *td,
 				     struct thermal_cooling_device *cdev,
 				     struct cooling_spec *cool_spec)
 {
-	struct thermal_trip_desc *td = trip_to_trip_desc(trip);
 	struct thermal_instance *dev, *instance;
 	bool upper_no_limit;
 	int result;
@@ -796,7 +795,7 @@ static int thermal_bind_cdev_to_trip(str
 		return -ENOMEM;
 
 	dev->cdev = cdev;
-	dev->trip = trip;
+	dev->trip = &td->trip;
 	dev->upper = cool_spec->upper;
 	dev->upper_no_limit = upper_no_limit;
 	dev->lower = cool_spec->lower;
@@ -867,7 +866,7 @@ free_mem:
 /**
  * thermal_unbind_cdev_from_trip - unbind a cooling device from a thermal zone.
  * @tz:		pointer to a struct thermal_zone_device.
- * @trip:	trip point the cooling devices is associated with in this zone.
+ * @td:		descriptor of the trip point to unbind @cdev from
  * @cdev:	pointer to a struct thermal_cooling_device.
  *
  * This interface function unbind a thermal cooling device from the certain
@@ -875,10 +874,9 @@ free_mem:
  * This function is usually called in the thermal zone device .unbind callback.
  */
 static void thermal_unbind_cdev_from_trip(struct thermal_zone_device *tz,
-					  struct thermal_trip *trip,
+					  struct thermal_trip_desc *td,
 					  struct thermal_cooling_device *cdev)
 {
-	struct thermal_trip_desc *td = trip_to_trip_desc(trip);
 	struct thermal_instance *pos, *next;
 
 	mutex_lock(&cdev->lock);
@@ -930,11 +928,11 @@ static struct class *thermal_class;
 
 static inline
 void print_bind_err_msg(struct thermal_zone_device *tz,
-			const struct thermal_trip *trip,
+			const struct thermal_trip_desc *td,
 			struct thermal_cooling_device *cdev, int ret)
 {
 	dev_err(&tz->device, "binding cdev %s to trip %d failed: %d\n",
-		cdev->type, thermal_zone_trip_id(tz, trip), ret);
+		cdev->type, thermal_zone_trip_id(tz, &td->trip), ret);
 }
 
 static bool __thermal_zone_cdev_bind(struct thermal_zone_device *tz,
@@ -947,7 +945,6 @@ static bool __thermal_zone_cdev_bind(str
 		return false;
 
 	for_each_trip_desc(tz, td) {
-		struct thermal_trip *trip = &td->trip;
 		struct cooling_spec c = {
 			.upper = THERMAL_NO_LIMIT,
 			.lower = THERMAL_NO_LIMIT,
@@ -955,12 +952,12 @@ static bool __thermal_zone_cdev_bind(str
 		};
 		int ret;
 
-		if (!tz->ops.should_bind(tz, trip, cdev, &c))
+		if (!tz->ops.should_bind(tz, &td->trip, cdev, &c))
 			continue;
 
-		ret = thermal_bind_cdev_to_trip(tz, trip, cdev, &c);
+		ret = thermal_bind_cdev_to_trip(tz, td, cdev, &c);
 		if (ret) {
-			print_bind_err_msg(tz, trip, cdev, ret);
+			print_bind_err_msg(tz, td, cdev, ret);
 			continue;
 		}
 
@@ -1279,7 +1276,7 @@ static void __thermal_zone_cdev_unbind(s
 	struct thermal_trip_desc *td;
 
 	for_each_trip_desc(tz, td)
-		thermal_unbind_cdev_from_trip(tz, &td->trip, cdev);
+		thermal_unbind_cdev_from_trip(tz, td, cdev);
 }
 
 static void thermal_zone_cdev_unbind(struct thermal_zone_device *tz,

Re: [PATCH v2 12/12] thermal: core: Pass trip descriptors to trip bind/unbind functions

Posted by Lukasz Luba 1 month, 1 week ago


On 10/4/24 20:42, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> The code is somewhat cleaner if struct thermal_trip_desc pointers are
> passed to thermal_bind_cdev_to_trip(), thermal_unbind_cdev_from_trip(),
> and print_bind_err_msg() instead of struct thermal_trip pointers, so
> modify it accordingly.
> 
> No intentional functional impact.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> 
> This is a new iteration of
> 
> https://lore.kernel.org/linux-pm/2954063.e9J7NaK4W3@rjwysocki.net/
> 
> v1 -> v2: Rebase and drop the leftover Subject: field from the preamble.
> 
> ---
>   drivers/thermal/thermal_core.c |   27 ++++++++++++---------------
>   1 file changed, 12 insertions(+), 15 deletions(-)
> 
> Index: linux-pm/drivers/thermal/thermal_core.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_core.c
> +++ linux-pm/drivers/thermal/thermal_core.c
> @@ -757,9 +757,9 @@ struct thermal_zone_device *thermal_zone
>   /**
>    * thermal_bind_cdev_to_trip - bind a cooling device to a thermal zone
>    * @tz:		pointer to struct thermal_zone_device
> - * @trip:	trip point the cooling devices is associated with in this zone.
> + * @td:		descriptor of the trip point to bind @cdev to
>    * @cdev:	pointer to struct thermal_cooling_device
> - * @cool_spec:	cooling specification for @trip and @cdev
> + * @cool_spec:	cooling specification for the trip point and @cdev
>    *
>    * This interface function bind a thermal cooling device to the certain trip
>    * point of a thermal zone device.
> @@ -768,11 +768,10 @@ struct thermal_zone_device *thermal_zone
>    * Return: 0 on success, the proper error value otherwise.
>    */
>   static int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,
> -				     struct thermal_trip *trip,
> +				     struct thermal_trip_desc *td,
>   				     struct thermal_cooling_device *cdev,
>   				     struct cooling_spec *cool_spec)
>   {
> -	struct thermal_trip_desc *td = trip_to_trip_desc(trip);
>   	struct thermal_instance *dev, *instance;
>   	bool upper_no_limit;
>   	int result;
> @@ -796,7 +795,7 @@ static int thermal_bind_cdev_to_trip(str
>   		return -ENOMEM;
>   
>   	dev->cdev = cdev;
> -	dev->trip = trip;
> +	dev->trip = &td->trip;
>   	dev->upper = cool_spec->upper;
>   	dev->upper_no_limit = upper_no_limit;
>   	dev->lower = cool_spec->lower;
> @@ -867,7 +866,7 @@ free_mem:
>   /**
>    * thermal_unbind_cdev_from_trip - unbind a cooling device from a thermal zone.
>    * @tz:		pointer to a struct thermal_zone_device.
> - * @trip:	trip point the cooling devices is associated with in this zone.
> + * @td:		descriptor of the trip point to unbind @cdev from
>    * @cdev:	pointer to a struct thermal_cooling_device.
>    *
>    * This interface function unbind a thermal cooling device from the certain
> @@ -875,10 +874,9 @@ free_mem:
>    * This function is usually called in the thermal zone device .unbind callback.
>    */
>   static void thermal_unbind_cdev_from_trip(struct thermal_zone_device *tz,
> -					  struct thermal_trip *trip,
> +					  struct thermal_trip_desc *td,
>   					  struct thermal_cooling_device *cdev)
>   {
> -	struct thermal_trip_desc *td = trip_to_trip_desc(trip);
>   	struct thermal_instance *pos, *next;
>   
>   	mutex_lock(&cdev->lock);
> @@ -930,11 +928,11 @@ static struct class *thermal_class;
>   
>   static inline
>   void print_bind_err_msg(struct thermal_zone_device *tz,
> -			const struct thermal_trip *trip,
> +			const struct thermal_trip_desc *td,
>   			struct thermal_cooling_device *cdev, int ret)
>   {
>   	dev_err(&tz->device, "binding cdev %s to trip %d failed: %d\n",
> -		cdev->type, thermal_zone_trip_id(tz, trip), ret);
> +		cdev->type, thermal_zone_trip_id(tz, &td->trip), ret);
>   }
>   
>   static bool __thermal_zone_cdev_bind(struct thermal_zone_device *tz,
> @@ -947,7 +945,6 @@ static bool __thermal_zone_cdev_bind(str
>   		return false;
>   
>   	for_each_trip_desc(tz, td) {
> -		struct thermal_trip *trip = &td->trip;
>   		struct cooling_spec c = {
>   			.upper = THERMAL_NO_LIMIT,
>   			.lower = THERMAL_NO_LIMIT,
> @@ -955,12 +952,12 @@ static bool __thermal_zone_cdev_bind(str
>   		};
>   		int ret;
>   
> -		if (!tz->ops.should_bind(tz, trip, cdev, &c))
> +		if (!tz->ops.should_bind(tz, &td->trip, cdev, &c))
>   			continue;
>   
> -		ret = thermal_bind_cdev_to_trip(tz, trip, cdev, &c);
> +		ret = thermal_bind_cdev_to_trip(tz, td, cdev, &c);
>   		if (ret) {
> -			print_bind_err_msg(tz, trip, cdev, ret);
> +			print_bind_err_msg(tz, td, cdev, ret);
>   			continue;
>   		}
>   
> @@ -1279,7 +1276,7 @@ static void __thermal_zone_cdev_unbind(s
>   	struct thermal_trip_desc *td;
>   
>   	for_each_trip_desc(tz, td)
> -		thermal_unbind_cdev_from_trip(tz, &td->trip, cdev);
> +		thermal_unbind_cdev_from_trip(tz, td, cdev);
>   }
>   
>   static void thermal_zone_cdev_unbind(struct thermal_zone_device *tz,
> 
> 
> 


Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>