[PATCH 14/14] cpufreq: tegra: use cpufreq_generic_init() routine

From: Viresh Kumar
Date: Wed Aug 21 2013 - 10:44:32 EST


Use generic cpufreq_generic_init() routine instead of replicating the same code
here.

Along with that we are disabling clks in error cases and ->exit() routine.

Cc: Stephen Warren <swarren@xxxxxxxxxx>
Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
---
drivers/cpufreq/tegra-cpufreq.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra-cpufreq.c
index 3f25ab6..bc7c2a1 100644
--- a/drivers/cpufreq/tegra-cpufreq.c
+++ b/drivers/cpufreq/tegra-cpufreq.c
@@ -161,18 +161,21 @@ static struct notifier_block tegra_cpu_pm_notifier = {

static int tegra_cpu_init(struct cpufreq_policy *policy)
{
+ int ret;
+
if (policy->cpu >= NUM_CPUS)
return -EINVAL;

clk_prepare_enable(emc_clk);
clk_prepare_enable(cpu_clk);

- cpufreq_table_validate_and_show(policy, freq_table);
-
/* FIXME: what's the actual transition time? */
- policy->cpuinfo.transition_latency = 300 * 1000;
-
- cpumask_copy(policy->cpus, cpu_possible_mask);
+ ret = cpufreq_generic_init(policy, freq_table, 300 * 1000);
+ if (ret) {
+ clk_disable_unprepare(cpu_clk);
+ clk_disable_unprepare(emc_clk);
+ return ret;
+ }

if (policy->cpu == 0)
register_pm_notifier(&tegra_cpu_pm_notifier);
@@ -183,6 +186,7 @@ static int tegra_cpu_init(struct cpufreq_policy *policy)
static int tegra_cpu_exit(struct cpufreq_policy *policy)
{
cpufreq_frequency_table_put_attr(policy->cpu);
+ clk_disable_unprepare(cpu_clk);
clk_disable_unprepare(emc_clk);
return 0;
}
--
1.7.12.rc2.18.g61b472e

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/