Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf736ea6 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Eduardo Valentin
Browse files

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: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 7ddab733

drivers/thermal/power_allocator.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}