mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
thermal: power_allocator: do not use devm* interfaces
The code in question is called outside of standard driver probe()/remove() callbacks and thus will not benefit from use of devm* infrastructure. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
parent
7ddab73346
commit
cf736ea6f9
1 changed files with 4 additions and 4 deletions
|
@ -334,7 +334,7 @@ static int allocate_power(struct thermal_zone_device *tz,
|
|||
max_allocatable_power, current_temp,
|
||||
(s32)control_temp - (s32)current_temp);
|
||||
|
||||
devm_kfree(&tz->device, req_power);
|
||||
kfree(req_power);
|
||||
unlock:
|
||||
mutex_unlock(&tz->lock);
|
||||
|
||||
|
@ -426,7 +426,7 @@ static int power_allocator_bind(struct thermal_zone_device *tz)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
params = devm_kzalloc(&tz->device, sizeof(*params), GFP_KERNEL);
|
||||
params = kzalloc(sizeof(*params), GFP_KERNEL);
|
||||
if (!params)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -468,14 +468,14 @@ static int power_allocator_bind(struct thermal_zone_device *tz)
|
|||
return 0;
|
||||
|
||||
free:
|
||||
devm_kfree(&tz->device, params);
|
||||
kfree(params);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void power_allocator_unbind(struct thermal_zone_device *tz)
|
||||
{
|
||||
dev_dbg(&tz->device, "Unbinding from thermal zone %d\n", tz->id);
|
||||
devm_kfree(&tz->device, tz->governor_data);
|
||||
kfree(tz->governor_data);
|
||||
tz->governor_data = NULL;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue