renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-11 23:23:52 +08:00
Code

thermal: devfreq_cooling: use a thermal_cooling_device for register and unregister

Browse Source 
Be consistent with what other cooling devices do and return a struct
thermal_cooling_device * on register.  Also, for the unregister, accept
a struct thermal_cooling_device * as parameter.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Javi Merino 2015-11-02 19:03:03 +00:00 committed by Eduardo Valentin
parent 8fb2b9ac2a
commit 3c99c2cef7
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/thermal/devfreq_cooling.c
View File

@ -467,7 +467,7 @@ free_power_table:
* devfreq should use the simple_ondemand governor, other governors * devfreq should use the simple_ondemand governor, other governors
* are not currently supported. * are not currently supported.
*/ */
struct devfreq_cooling_device * struct thermal_cooling_device *
of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df, of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
struct devfreq_cooling_power *dfc_power) struct devfreq_cooling_power *dfc_power)
{ {
@ -513,7 +513,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
dfc->cdev = cdev; dfc->cdev = cdev;
return dfc; return cdev;
release_idr: release_idr:
release_idr(&devfreq_idr, dfc->id); release_idr(&devfreq_idr, dfc->id);
@ -533,7 +533,7 @@ EXPORT_SYMBOL_GPL(of_devfreq_cooling_register_power);
* @np: Pointer to OF device_node. * @np: Pointer to OF device_node.
* @df: Pointer to devfreq device. * @df: Pointer to devfreq device.
*/ */
struct devfreq_cooling_device * struct thermal_cooling_device *
of_devfreq_cooling_register(struct device_node *np, struct devfreq *df) of_devfreq_cooling_register(struct device_node *np, struct devfreq *df)
{ {
return of_devfreq_cooling_register_power(np, df, NULL); return of_devfreq_cooling_register_power(np, df, NULL);
@ -544,7 +544,7 @@ EXPORT_SYMBOL_GPL(of_devfreq_cooling_register);
* devfreq_cooling_register() - Register devfreq cooling device. * devfreq_cooling_register() - Register devfreq cooling device.
* @df: Pointer to devfreq device. * @df: Pointer to devfreq device.
*/ */
struct devfreq_cooling_device *devfreq_cooling_register(struct devfreq *df) struct thermal_cooling_device *devfreq_cooling_register(struct devfreq *df)
{ {
return of_devfreq_cooling_register(NULL, df); return of_devfreq_cooling_register(NULL, df);
} }
@ -554,11 +554,15 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_register);
* devfreq_cooling_unregister() - Unregister devfreq cooling device. * devfreq_cooling_unregister() - Unregister devfreq cooling device.
* @dfc: Pointer to devfreq cooling device to unregister. * @dfc: Pointer to devfreq cooling device to unregister.
*/ */
void devfreq_cooling_unregister(struct devfreq_cooling_device *dfc) void devfreq_cooling_unregister(struct thermal_cooling_device *cdev)
{ {
if (!dfc) struct devfreq_cooling_device *dfc;
if (!cdev)
return; return;
dfc = cdev->devdata;
thermal_cooling_device_unregister(dfc->cdev); thermal_cooling_device_unregister(dfc->cdev);
release_idr(&devfreq_idr, dfc->id); release_idr(&devfreq_idr, dfc->id);
kfree(dfc->power_table); kfree(dfc->power_table);

16
include/linux/devfreq_cooling.h
View File

@ -43,37 +43,37 @@ struct devfreq_cooling_power {
unsigned long dyn_power_coeff; unsigned long dyn_power_coeff;
}; };
struct devfreq_cooling_device * struct thermal_cooling_device *
of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df, of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
struct devfreq_cooling_power *dfc_power); struct devfreq_cooling_power *dfc_power);
struct devfreq_cooling_device * struct thermal_cooling_device *
of_devfreq_cooling_register(struct device_node *np, struct devfreq *df); of_devfreq_cooling_register(struct device_node *np, struct devfreq *df);
struct devfreq_cooling_device *devfreq_cooling_register(struct devfreq *df); struct thermal_cooling_device *devfreq_cooling_register(struct devfreq *df);
void devfreq_cooling_unregister(struct devfreq_cooling_device *dfc); void devfreq_cooling_unregister(struct thermal_cooling_device *dfc);
#else /* !CONFIG_DEVFREQ_THERMAL */ #else /* !CONFIG_DEVFREQ_THERMAL */
struct devfreq_cooling_device * struct thermal_cooling_device *
of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df, of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
struct devfreq_cooling_power *dfc_power) struct devfreq_cooling_power *dfc_power)
{ {
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
static inline struct devfreq_cooling_device * static inline struct thermal_cooling_device *
of_devfreq_cooling_register(struct device_node *np, struct devfreq *df) of_devfreq_cooling_register(struct device_node *np, struct devfreq *df)
{ {
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
static inline struct devfreq_cooling_device * static inline struct thermal_cooling_device *
devfreq_cooling_register(struct devfreq *df) devfreq_cooling_register(struct devfreq *df)
{ {
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
static inline void static inline void
devfreq_cooling_unregister(struct devfreq_cooling_device *dfc) devfreq_cooling_unregister(struct thermal_cooling_device *dfc)
{ {
} }