Re: [PATCH v4 05/10] thermal/of: Move cooling device OF helpers out of thermal core

[Lukasz Luba]

On 5/26/26 15:08, Daniel Lezcano wrote:
> The functions:
>   - thermal_of_cooling_device_register()
>   - devm_thermal_of_cooling_device_register()
>
> are specific to device tree usage but are currently implemented in
> thermal_core.c.
>
> Move them to thermal_of.c to better reflect the separation between
> generic thermal core code and OF-specific logic.
>
> This change is enabled by the recent split of the cooling device
> registration into allocation and addition phases, allowing OF-specific
> handling (such as device node assignment) to be isolated from the core.
>
> No functional change intended.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxxxxxxxx>
> ---
>   drivers/thermal/thermal_core.c | 80 +-------------------------------
>   drivers/thermal/thermal_core.h |  5 ++
>   drivers/thermal/thermal_of.c   | 83 ++++++++++++++++++++++++++++++++++
>   include/linux/thermal.h        | 49 ++++++++++++--------
>   4 files changed, 119 insertions(+), 98 deletions(-)
>
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index bb4fc3ff2ad5..28a20d4b475c 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -963,7 +963,7 @@ static void thermal_cdev_release(struct device *dev)
>   	kfree(cdev);
>   }
>   
> -static struct thermal_cooling_device *
> +struct thermal_cooling_device *
>   thermal_cooling_device_alloc(const char *type, const struct thermal_cooling_device_ops *ops)
>   {
>   	struct thermal_cooling_device *cdev;
> @@ -1002,7 +1002,7 @@ thermal_cooling_device_alloc(const char *type, const struct thermal_cooling_devi
>   	return ERR_PTR(ret);
>   }
>   
> -static int thermal_cooling_device_add(struct thermal_cooling_device *cdev, void *devdata)
> +int thermal_cooling_device_add(struct thermal_cooling_device *cdev, void *devdata)
>   {
>   	unsigned long current_state;
>   	int ret;
> @@ -1090,44 +1090,6 @@ thermal_cooling_device_register(const char *type, void *devdata,
>   }
>   EXPORT_SYMBOL_GPL(thermal_cooling_device_register);
>   
> -/**
> - * thermal_of_cooling_device_register() - register an OF thermal cooling device
> - * @np:		a pointer to a device tree node.
> - * @type:	the thermal cooling device type.
> - * @devdata:	device private data.
> - * @ops:	standard thermal cooling devices callbacks.
> - *
> - * This interface function adds a new thermal cooling device (fan/processor/...)
> - * to /sys/class/thermal/ folder as cooling_device[0-*]. It tries to bind itself
> - * to all the thermal zone devices registered at the same time.
> - * It also gives the opportunity to link the cooling device to a device tree
> - * node, so that it can be bound to a thermal zone created out of device tree.
> - *
> - * Return: a pointer to the created struct thermal_cooling_device or an
> - * ERR_PTR. Caller must check return value with IS_ERR*() helpers.
> - */
> -struct thermal_cooling_device *
> -thermal_of_cooling_device_register(struct device_node *np,
> -				     const char *type, void *devdata,
> -				     const struct thermal_cooling_device_ops *ops)
> -{
> -	struct thermal_cooling_device *cdev;
> -	int ret;
> -
> -	cdev = thermal_cooling_device_alloc(type, ops);
> -	if (IS_ERR(cdev))
> -		return cdev;
> -
> -	cdev->np = np;
> -
> -	ret = thermal_cooling_device_add(cdev, devdata);
> -	if (ret)
> -		return ERR_PTR(ret);
> -
> -	return cdev;
> -}
> -EXPORT_SYMBOL_GPL(thermal_of_cooling_device_register);
> -
>   static void thermal_cooling_device_release(void *data)
>   {
>   	struct thermal_cooling_device *cdev = data;
> @@ -1135,44 +1097,6 @@ static void thermal_cooling_device_release(void *data)
>   	thermal_cooling_device_unregister(cdev);
>   }
>   
> -/**
> - * devm_thermal_of_cooling_device_register() - register an OF thermal cooling
> - *					       device
> - * @dev:	a valid struct device pointer of a sensor device.
> - * @np:		a pointer to a device tree node.
> - * @type:	the thermal cooling device type.
> - * @devdata:	device private data.
> - * @ops:	standard thermal cooling devices callbacks.
> - *
> - * This function will register a cooling device with device tree node reference.
> - * This interface function adds a new thermal cooling device (fan/processor/...)
> - * to /sys/class/thermal/ folder as cooling_device[0-*]. It tries to bind itself
> - * to all the thermal zone devices registered at the same time.
> - *
> - * Return: a pointer to the created struct thermal_cooling_device or an
> - * ERR_PTR. Caller must check return value with IS_ERR*() helpers.
> - */
> -struct thermal_cooling_device *
> -devm_thermal_of_cooling_device_register(struct device *dev,
> -				struct device_node *np,
> -				const char *type, void *devdata,
> -				const struct thermal_cooling_device_ops *ops)
> -{
> -	struct thermal_cooling_device *cdev;
> -	int ret;
> -
> -	cdev = thermal_of_cooling_device_register(np, type, devdata, ops);
> -	if (IS_ERR(cdev))
> -		return cdev;
> -
> -	ret = devm_add_action_or_reset(dev, thermal_cooling_device_release, cdev);
> -	if (ret)
> -		return ERR_PTR(ret);
> -
> -	return cdev;
> -}
> -EXPORT_SYMBOL_GPL(devm_thermal_of_cooling_device_register);
> -
>   /**
>    * devm_thermal_cooling_device_register() - register a thermal cooling device
>    *
> diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
> index 0acb7d9587ca..e98b0aa5aacc 100644
> --- a/drivers/thermal/thermal_core.h
> +++ b/drivers/thermal/thermal_core.h
> @@ -267,6 +267,11 @@ void thermal_zone_device_critical_shutdown(struct thermal_zone_device *tz);
>   void thermal_governor_update_tz(struct thermal_zone_device *tz,
>   				enum thermal_notify_event reason);
>   
> +struct thermal_cooling_device *
> +thermal_cooling_device_alloc(const char *type, const struct thermal_cooling_device_ops *ops);
> +
> +int thermal_cooling_device_add(struct thermal_cooling_device *cdev, void *devdata);
> +
>   /* Helpers */
>   #define for_each_trip_desc(__tz, __td)	\
>   	for (__td = __tz->trips; __td - __tz->trips < __tz->num_trips; __td++)
> diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
> index 75fb7663c507..8c49d449d43f 100644
> --- a/drivers/thermal/thermal_of.c
> +++ b/drivers/thermal/thermal_of.c
> @@ -510,3 +510,86 @@ void devm_thermal_of_zone_unregister(struct device *dev, struct thermal_zone_dev
>   			       devm_thermal_of_zone_match, tz));
>   }
>   EXPORT_SYMBOL_GPL(devm_thermal_of_zone_unregister);
> +
> +/**
> + * thermal_of_cooling_device_register() - register an OF thermal cooling device
> + * @np:		a pointer to a device tree node.
> + * @type:	the thermal cooling device type.
> + * @devdata:	device private data.
> + * @ops:	standard thermal cooling devices callbacks.
> + *
> + * This interface function adds a new thermal cooling device (fan/processor/...)
> + * to /sys/class/thermal/ folder as cooling_device[0-*]. It tries to bind itself
> + * to all the thermal zone devices registered at the same time.
> + * It also gives the opportunity to link the cooling device to a device tree
> + * node, so that it can be bound to a thermal zone created out of device tree.
> + *
> + * Return: a pointer to the created struct thermal_cooling_device or an
> + * ERR_PTR. Caller must check return value with IS_ERR*() helpers.
> + */
> +struct thermal_cooling_device *
> +thermal_of_cooling_device_register(struct device_node *np,
> +				     const char *type, void *devdata,
> +				     const struct thermal_cooling_device_ops *ops)
> +{
> +	struct thermal_cooling_device *cdev;
> +	int ret;
> +
> +	cdev = thermal_cooling_device_alloc(type, ops);
> +	if (IS_ERR(cdev))
> +		return cdev;
> +
> +	cdev->np = np;
> +
> +	ret = thermal_cooling_device_add(cdev, devdata);
> +	if (ret)
> +		return ERR_PTR(ret);
> +
> +	return cdev;
> +}
> +EXPORT_SYMBOL_GPL(thermal_of_cooling_device_register);
> +
> +static void thermal_of_cooling_device_release(void *data)
> +{
> +	struct thermal_cooling_device *cdev = data;
> +
> +	thermal_cooling_device_unregister(cdev);
> +}
> +
> +/**
> + * devm_thermal_of_cooling_device_register() - register an OF thermal cooling
> + *                                             device
> + * @dev:        a valid struct device pointer of a sensor device.
> + * @np:         a pointer to a device tree node.
> + * @type:       the thermal cooling device type.
> + * @devdata:    device private data.
> + * @ops:        standard thermal cooling devices callbacks.
> + *
> + * This function will register a cooling device with device tree node reference.
> + * This interface function adds a new thermal cooling device (fan/processor/...)
> + * to /sys/class/thermal/ folder as cooling_device[0-*]. It tries to bind itself
> + * to all the thermal zone devices registered at the same time.
> + *
> + * Return: a pointer to the created struct thermal_cooling_device or an
> + * ERR_PTR. Caller must check return value with IS_ERR*() helpers.
> + */
> +struct thermal_cooling_device *
> +devm_thermal_of_cooling_device_register(struct device *dev,
> +                                struct device_node *np,
> +                                const char *type, void *devdata,
> +                                const struct thermal_cooling_device_ops *ops)
> +{
> +        struct thermal_cooling_device *cdev;
> +        int ret;
> +
> +        cdev = thermal_of_cooling_device_register(np, type, devdata, ops);
> +        if (IS_ERR(cdev))
> +                return cdev;
> +
> +        ret = devm_add_action_or_reset(dev, thermal_of_cooling_device_release, cdev);
> +        if (ret)
> +                return ERR_PTR(ret);
> +
> +        return cdev;
> +}
> +EXPORT_SYMBOL_GPL(devm_thermal_of_cooling_device_register);
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index 60e596e7d7ae..6d1862ac187f 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -200,6 +200,15 @@ struct thermal_zone_device *devm_thermal_of_zone_register(struct device *dev, in
>   
>   void devm_thermal_of_zone_unregister(struct device *dev, struct thermal_zone_device *tz);
>   
> +struct thermal_cooling_device *
> +thermal_of_cooling_device_register(struct device_node *np, const char *type, void *devdata,
> +				   const struct thermal_cooling_device_ops *ops);
> +
> +struct thermal_cooling_device *
> +devm_thermal_of_cooling_device_register(struct device *dev,
> +					struct device_node *np,
> +					const char *type, void *devdata,
> +					const struct thermal_cooling_device_ops *ops);
>   #else
>   
>   static inline
> @@ -213,6 +222,23 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev,
>   						   struct thermal_zone_device *tz)
>   {
>   }
> +
> +static inline struct thermal_cooling_device *
> +thermal_of_cooling_device_register(struct device_node *np,
> +				   const char *type, void *devdata,
> +				   const struct thermal_cooling_device_ops *ops)
> +{
> +	return ERR_PTR(-ENODEV);
> +}
> +
> +static inline struct thermal_cooling_device *
> +devm_thermal_of_cooling_device_register(struct device *dev,
> +					struct device_node *np,
> +					const char *type, void *devdata,
> +					const struct thermal_cooling_device_ops *ops)
> +{
> +	return ERR_PTR(-ENODEV);
> +}
>   #endif
>   
>   int for_each_thermal_trip(struct thermal_zone_device *tz,
> @@ -254,17 +280,11 @@ void thermal_zone_device_update(struct thermal_zone_device *,
>   
>   struct thermal_cooling_device *thermal_cooling_device_register(const char *,
>   		void *, const struct thermal_cooling_device_ops *);
> +
>   struct thermal_cooling_device *
>   devm_thermal_cooling_device_register(struct device *dev, const char *type, void *devdata,
>   				     const struct thermal_cooling_device_ops *ops);
> -struct thermal_cooling_device *
> -thermal_of_cooling_device_register(struct device_node *np, const char *type, void *devdata,
> -				   const struct thermal_cooling_device_ops *ops);
> -struct thermal_cooling_device *
> -devm_thermal_of_cooling_device_register(struct device *dev,
> -				struct device_node *np,
> -				const char *type, void *devdata,
> -				const struct thermal_cooling_device_ops *ops);
> +
>   void thermal_cooling_device_update(struct thermal_cooling_device *);
>   void thermal_cooling_device_unregister(struct thermal_cooling_device *);
>   struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name);
> @@ -310,18 +330,7 @@ thermal_cooling_device_register(const char *type, void *devdata,
>   	const struct thermal_cooling_device_ops *ops)
>   { return ERR_PTR(-ENODEV); }
>   static inline struct thermal_cooling_device *
> -thermal_of_cooling_device_register(struct device_node *np,
> -	const char *type, void *devdata,
> -	const struct thermal_cooling_device_ops *ops)
> -{ return ERR_PTR(-ENODEV); }
> -static inline struct thermal_cooling_device *
> -devm_thermal_of_cooling_device_register(struct device *dev,
> -				struct device_node *np,
> -				const char *type, void *devdata,
> -				const struct thermal_cooling_device_ops *ops)
> -{
> -	return ERR_PTR(-ENODEV);
> -}
> +
>   static inline void thermal_cooling_device_unregister(
>   	struct thermal_cooling_device *cdev)
>   { }


I would change the order of patch 04/10 and this one.

Other than that:

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