Skip to content

Commit

Permalink
thermal: gov_power_allocator: Rearrange initialization of local varia…
Browse files Browse the repository at this point in the history
…bles

Rearrange the initialization of local variables in allocate_power() so
as to improve code clarity and the visibility of the initial values.

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>
  • Loading branch information
Lukasz Luba authored and Rafael J. Wysocki committed Nov 28, 2023
1 parent 0458d53 commit 401888e
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions drivers/thermal/gov_power_allocator.c
Original file line number Diff line number Diff line change
Expand Up @@ -376,16 +376,19 @@ static void divvy_up_power(u32 *req_power, u32 *max_power, int num_actors,

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;
u32 total_granted_power, power_range;
struct thermal_cooling_device *cdev;
struct thermal_instance *instance;
u32 total_weighted_req_power = 0;
u32 max_allocatable_power = 0;
u32 total_granted_power = 0;
u32 total_req_power = 0;
u32 *weighted_req_power;
u32 power_range, weight;
int total_weight = 0;
int num_actors = 0;
int i, weight;
int i = 0;

list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
if ((instance->trip == params->trip_max) &&
Expand Down Expand Up @@ -418,11 +421,6 @@ static int allocate_power(struct thermal_zone_device *tz, int control_temp)
extra_actor_power = &req_power[3 * num_actors];
weighted_req_power = &req_power[4 * num_actors];

i = 0;
total_weighted_req_power = 0;
total_req_power = 0;
max_allocatable_power = 0;

list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
cdev = instance->cdev;

Expand Down Expand Up @@ -459,7 +457,6 @@ static int allocate_power(struct thermal_zone_device *tz, int control_temp)
total_weighted_req_power, power_range, granted_power,
extra_actor_power);

total_granted_power = 0;
i = 0;
list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
if (instance->trip != params->trip_max)
Expand Down

0 comments on commit 401888e

Please sign in to comment.