Commit b4ab114c authored by Guenter Roeck's avatar Guenter Roeck Committed by Eduardo Valentin
Browse files

thermal: Introduce devm_thermal_of_cooling_device_register 



thermal_of_cooling_device_register() and thermal_cooling_device_register()
are typically called from driver probe functions, and
thermal_cooling_device_unregister() is called from remove functions. This
makes both a perfect candidate for device managed functions.

Introduce devm_thermal_of_cooling_device_register(). This function can
also be used to replace thermal_cooling_device_register() by passing a NULL
pointer as device node. The new function requires both struct device *
and struct device_node * as parameters since the struct device_node *
parameter is not always identical to dev->of_node.

Don't introduce a device managed remove function since it is not needed
at this point.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 80d95930

drivers/thermal/thermal_core.c

+49 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,55 @@ thermal_of_cooling_device_register(struct device_node *np, 
}

EXPORT_SYMBOL_GPL(thermal_of_cooling_device_register);



static void thermal_cooling_device_release(struct device *dev, void *res)

{

	thermal_cooling_device_unregister(

				*(struct thermal_cooling_device **)res);

}



/**

 * 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,

				char *type, void *devdata,

				const struct thermal_cooling_device_ops *ops)

{

	struct thermal_cooling_device **ptr, *tcd;



	ptr = devres_alloc(thermal_cooling_device_release, sizeof(*ptr),

			   GFP_KERNEL);

	if (!ptr)

		return ERR_PTR(-ENOMEM);



	tcd = __thermal_cooling_device_register(np, type, devdata, ops);

	if (IS_ERR(tcd)) {

		devres_free(ptr);

		return tcd;

	}



	*ptr = tcd;

	devres_add(dev, ptr);



	return tcd;

}

EXPORT_SYMBOL_GPL(devm_thermal_of_cooling_device_register);



static void __unbind(struct thermal_zone_device *tz, int mask,

		     struct thermal_cooling_device *cdev)

{

include/linux/thermal.h

+13 −0
Original line number Diff line number Diff line
@@ -447,6 +447,11 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *, void *, 
struct thermal_cooling_device *

thermal_of_cooling_device_register(struct device_node *np, char *, void *,

				   const struct thermal_cooling_device_ops *);

struct thermal_cooling_device *

devm_thermal_of_cooling_device_register(struct device *dev,

				struct device_node *np,

				char *type, void *devdata,

				const struct thermal_cooling_device_ops *ops);

void thermal_cooling_device_unregister(struct thermal_cooling_device *);

struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name);

int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
@@ -503,6 +508,14 @@ static inline struct thermal_cooling_device * 
thermal_of_cooling_device_register(struct device_node *np,

	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,

				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)

{ }

CRA Git | Maintained and supported by SUSTech CRA and CCSE