mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
thermal: gov_power_allocator: Remove excessive local variables
Local variable 'ret' in allocate_power() is only used in the return statement, so drop it. Local variable 'trip_max' in allocate_power() is only used for caching the params->trip_max value which may as well be accessed directly as needed, so drop it either. This change is not expected to alter the general functionality. Signed-off-by: Lukasz Luba <lukasz.luba@arm.com> [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
30e1178c10
commit
0458d536ae
1 changed files with 5 additions and 6 deletions
|
@ -379,17 +379,16 @@ static int allocate_power(struct thermal_zone_device *tz, int control_temp)
|
|||
u32 total_req_power, max_allocatable_power, total_weighted_req_power;
|
||||
u32 *req_power, *max_power, *granted_power, *extra_actor_power;
|
||||
struct power_allocator_params *params = tz->governor_data;
|
||||
const struct thermal_trip *trip_max = params->trip_max;
|
||||
u32 total_granted_power, power_range;
|
||||
struct thermal_cooling_device *cdev;
|
||||
struct thermal_instance *instance;
|
||||
u32 *weighted_req_power;
|
||||
int i, weight, ret = 0;
|
||||
int total_weight = 0;
|
||||
int num_actors = 0;
|
||||
int i, weight;
|
||||
|
||||
list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
|
||||
if ((instance->trip == trip_max) &&
|
||||
if ((instance->trip == params->trip_max) &&
|
||||
cdev_is_power_actor(instance->cdev)) {
|
||||
num_actors++;
|
||||
total_weight += instance->weight;
|
||||
|
@ -427,7 +426,7 @@ static int allocate_power(struct thermal_zone_device *tz, int control_temp)
|
|||
list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
|
||||
cdev = instance->cdev;
|
||||
|
||||
if (instance->trip != trip_max)
|
||||
if (instance->trip != params->trip_max)
|
||||
continue;
|
||||
|
||||
if (!cdev_is_power_actor(cdev))
|
||||
|
@ -463,7 +462,7 @@ static int allocate_power(struct thermal_zone_device *tz, int control_temp)
|
|||
total_granted_power = 0;
|
||||
i = 0;
|
||||
list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
|
||||
if (instance->trip != trip_max)
|
||||
if (instance->trip != params->trip_max)
|
||||
continue;
|
||||
|
||||
if (!cdev_is_power_actor(instance->cdev))
|
||||
|
@ -484,7 +483,7 @@ static int allocate_power(struct thermal_zone_device *tz, int control_temp)
|
|||
|
||||
kfree(req_power);
|
||||
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue