get_dynamic_power(struct devfreq_cooling_device *dfc, unsigned long freq,
unsigned long voltage)
{
- unsigned long power;
+ u64 power;
u32 freq_mhz;
struct devfreq_cooling_power *dfc_power = dfc->power_ops;
power_table = kcalloc(num_opps, sizeof(*power_table),
GFP_KERNEL);
if (!power_table)
- ret = -ENOMEM;
+ return -ENOMEM;
}
freq_table = kcalloc(num_opps, sizeof(*freq_table),
* devfreq should use the simple_ondemand governor, other governors
* are not currently supported.
*/
-struct devfreq_cooling_device *
+struct thermal_cooling_device *
of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
struct devfreq_cooling_power *dfc_power)
{
dfc->cdev = cdev;
- return dfc;
+ return cdev;
release_idr:
release_idr(&devfreq_idr, dfc->id);
* @np: Pointer to OF device_node.
* @df: Pointer to devfreq device.
*/
-struct devfreq_cooling_device *
+struct thermal_cooling_device *
of_devfreq_cooling_register(struct device_node *np, struct devfreq *df)
{
return of_devfreq_cooling_register_power(np, df, NULL);
* devfreq_cooling_register() - Register devfreq cooling 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);
}
* devfreq_cooling_unregister() - Unregister devfreq cooling device.
* @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;
+ dfc = cdev->devdata;
+
thermal_cooling_device_unregister(dfc->cdev);
release_idr(&devfreq_idr, dfc->id);
kfree(dfc->power_table);