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

Commit e9698cc5 authored by Srivatsa S. Bhat's avatar Srivatsa S. Bhat Committed by Rafael J. Wysocki
Browse files

cpufreq: Add helper to perform alloc/free of policy structure 



Separate out the allocation of the cpufreq policy structure (along with
its error handling) to a helper function. This makes the code easier to
read and also helps with some upcoming code reorganization.

Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 23d32899

drivers/cpufreq/cpufreq.c

+34 −15
Original line number Diff line number Diff line
@@ -944,6 +944,37 @@ static int cpufreq_add_policy_cpu(unsigned int cpu, unsigned int sibling, 
}

#endif



static struct cpufreq_policy *cpufreq_policy_alloc(void)

{

	struct cpufreq_policy *policy;



	policy = kzalloc(sizeof(*policy), GFP_KERNEL);

	if (!policy)

		return NULL;



	if (!alloc_cpumask_var(&policy->cpus, GFP_KERNEL))

		goto err_free_policy;



	if (!zalloc_cpumask_var(&policy->related_cpus, GFP_KERNEL))

		goto err_free_cpumask;



	return policy;



err_free_cpumask:

	free_cpumask_var(policy->cpus);

err_free_policy:

	kfree(policy);



	return NULL;

}



static void cpufreq_policy_free(struct cpufreq_policy *policy)

{

	free_cpumask_var(policy->related_cpus);

	free_cpumask_var(policy->cpus);

	kfree(policy);

}



/**

 * cpufreq_add_dev - add a CPU device

 *
@@ -997,16 +1028,10 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) 
		goto module_out;

	}



	policy = kzalloc(sizeof(struct cpufreq_policy), GFP_KERNEL);

	policy = cpufreq_policy_alloc();

	if (!policy)

		goto nomem_out;



	if (!alloc_cpumask_var(&policy->cpus, GFP_KERNEL))

		goto err_free_policy;



	if (!zalloc_cpumask_var(&policy->related_cpus, GFP_KERNEL))

		goto err_free_cpumask;



	policy->cpu = cpu;

	policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

	cpumask_copy(policy->cpus, cpumask_of(cpu));
@@ -1071,11 +1096,7 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) 


err_set_policy_cpu:

	per_cpu(cpufreq_policy_cpu, cpu) = -1;

	free_cpumask_var(policy->related_cpus);

err_free_cpumask:

	free_cpumask_var(policy->cpus);

err_free_policy:

	kfree(policy);

	cpufreq_policy_free(policy);

nomem_out:

	module_put(cpufreq_driver->owner);

module_out:
@@ -1199,9 +1220,7 @@ static int __cpufreq_remove_dev(struct device *dev, 
		if (cpufreq_driver->exit)

			cpufreq_driver->exit(data);



		free_cpumask_var(data->related_cpus);

		free_cpumask_var(data->cpus);

		kfree(data);

		cpufreq_policy_free(data);

	} else {

		pr_debug("%s: removing link, cpu: %d\n", __func__, cpu);

		cpufreq_cpu_put(data);