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

Commit c4dcc8a1 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: Make cpufreq_generic_init() return void 



It always returns 0 (success) and its return type should really be void.

Over that, many drivers have added error handling code based on its
return value, which is not required at all.

Change its return type to void and update all the callers.

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

drivers/cpufreq/bmips-cpufreq.c

+6 −11
Original line number Diff line number Diff line
@@ -131,23 +131,18 @@ static int bmips_cpufreq_exit(struct cpufreq_policy *policy) 
static int bmips_cpufreq_init(struct cpufreq_policy *policy)

{

	struct cpufreq_frequency_table *freq_table;

	int ret;



	freq_table = bmips_cpufreq_get_freq_table(policy);

	if (IS_ERR(freq_table)) {

		ret = PTR_ERR(freq_table);

		pr_err("%s: couldn't determine frequency table (%d).\n",

			BMIPS_CPUFREQ_NAME, ret);

		return ret;

		pr_err("%s: couldn't determine frequency table (%ld).\n",

			BMIPS_CPUFREQ_NAME, PTR_ERR(freq_table));

		return PTR_ERR(freq_table);

	}



	ret = cpufreq_generic_init(policy, freq_table, TRANSITION_LATENCY);

	if (ret)

		bmips_cpufreq_exit(policy);

	else

	cpufreq_generic_init(policy, freq_table, TRANSITION_LATENCY);

	pr_info("%s: registered\n", BMIPS_CPUFREQ_NAME);



	return ret;

	return 0;

}



static struct cpufreq_driver bmips_cpufreq_driver = {

drivers/cpufreq/cpufreq.c

+1 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ EXPORT_SYMBOL_GPL(arch_set_freq_scale); 
 * - set policies transition latency

 * - policy->cpus with all possible CPUs

 */

int cpufreq_generic_init(struct cpufreq_policy *policy,

void cpufreq_generic_init(struct cpufreq_policy *policy,

		struct cpufreq_frequency_table *table,

		unsigned int transition_latency)

{
@@ -174,8 +174,6 @@ int cpufreq_generic_init(struct cpufreq_policy *policy, 
	 * share the clock and voltage and clock.

	 */

	cpumask_setall(policy->cpus);



	return 0;

}

EXPORT_SYMBOL_GPL(cpufreq_generic_init);

drivers/cpufreq/davinci-cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ static int davinci_cpu_init(struct cpufreq_policy *policy) 
	 * Setting the latency to 2000 us to accommodate addition of drivers

	 * to pre/post change notification list.

	 */

	return cpufreq_generic_init(policy, freq_table, 2000 * 1000);

	cpufreq_generic_init(policy, freq_table, 2000 * 1000);

	return 0;

}



static struct cpufreq_driver davinci_driver = {

drivers/cpufreq/imx6q-cpufreq.c

+2 −4
Original line number Diff line number Diff line
@@ -193,14 +193,12 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index) 


static int imx6q_cpufreq_init(struct cpufreq_policy *policy)

{

	int ret;



	policy->clk = clks[ARM].clk;

	ret = cpufreq_generic_init(policy, freq_table, transition_latency);

	cpufreq_generic_init(policy, freq_table, transition_latency);

	policy->suspend_freq = max_freq;

	dev_pm_opp_of_register_em(policy->cpus);



	return ret;

	return 0;

}



static struct cpufreq_driver imx6q_cpufreq_driver = {

drivers/cpufreq/kirkwood-cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ static int kirkwood_cpufreq_target(struct cpufreq_policy *policy, 
/* Module init and exit code */

static int kirkwood_cpufreq_cpu_init(struct cpufreq_policy *policy)

{

	return cpufreq_generic_init(policy, kirkwood_freq_table, 5000);

	cpufreq_generic_init(policy, kirkwood_freq_table, 5000);

	return 0;

}



static struct cpufreq_driver kirkwood_cpufreq_driver = {