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

Commit cea6a9e7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpufreq: governor: Symmetrize cpu_dbs_info initialization and cleanup 



Make the initialization of struct cpu_dbs_info objects in
alloc_policy_dbs_info() and the code that cleans them up in
free_policy_dbs_info() more symmetrical.  In particular,
set/clear the update_util.func field in those functions along
with the policy_dbs field.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent bc505475

drivers/cpufreq/cpufreq_governor.c

+13 −8
Original line number Original line Diff line number Diff line
@@ -304,14 +304,18 @@ static struct policy_dbs_info *alloc_policy_dbs_info(struct cpufreq_policy *poli 
	if (!policy_dbs)

	if (!policy_dbs)

		return NULL;

		return NULL;





	/* Set policy_dbs for all CPUs, online+offline */

	for_each_cpu(j, policy->related_cpus)

		gov->get_cpu_cdbs(j)->policy_dbs = policy_dbs;



	mutex_init(&policy_dbs->timer_mutex);

	mutex_init(&policy_dbs->timer_mutex);

	atomic_set(&policy_dbs->skip_work, 0);

	atomic_set(&policy_dbs->skip_work, 0);

	init_irq_work(&policy_dbs->irq_work, dbs_irq_work);

	init_irq_work(&policy_dbs->irq_work, dbs_irq_work);

	INIT_WORK(&policy_dbs->work, dbs_work_handler);

	INIT_WORK(&policy_dbs->work, dbs_work_handler);



	/* Set policy_dbs for all CPUs, online+offline */

	for_each_cpu(j, policy->related_cpus) {

		struct cpu_dbs_info *j_cdbs = gov->get_cpu_cdbs(j);



		j_cdbs->policy_dbs = policy_dbs;

		j_cdbs->update_util.func = dbs_update_util_handler;

	}

	return policy_dbs;

	return policy_dbs;

}

}
@@ -324,9 +328,12 @@ static void free_policy_dbs_info(struct cpufreq_policy *policy, 




	mutex_destroy(&policy_dbs->timer_mutex);

	mutex_destroy(&policy_dbs->timer_mutex);





	for_each_cpu(j, policy->cpus)

	for_each_cpu(j, policy->related_cpus) {

		gov->get_cpu_cdbs(j)->policy_dbs = NULL;

		struct cpu_dbs_info *j_cdbs = gov->get_cpu_cdbs(j);





		j_cdbs->policy_dbs = NULL;

		j_cdbs->update_util.func = NULL;

	}

	kfree(policy_dbs);

	kfree(policy_dbs);

}

}
@@ -477,8 +484,6 @@ static int cpufreq_governor_start(struct cpufreq_policy *policy) 




		if (ignore_nice)

		if (ignore_nice)

			j_cdbs->prev_cpu_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];

			j_cdbs->prev_cpu_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];



		j_cdbs->update_util.func = dbs_update_util_handler;

	}

	}

	policy_dbs->policy = policy;

	policy_dbs->policy = policy;