MIPS: Loongson2: Use clk API instead of direct dereferences
authorJulia Lawall <Julia.Lawall@lip6.fr>
Thu, 3 Jan 2013 09:34:20 +0000 (09:34 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 15 Feb 2013 22:07:37 +0000 (23:07 +0100)
A struct clk value is intended to be an abstract pointer, so it should be
manipulated using the various API functions.

clk_put is additionally added on the failure paths.

The semantic match that finds the first problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e,e1;
identifier i;
@@

*e = clk_get(...)
 ... when != e = e1
     when any
*e->i
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: kernel-janitors@vger.kernel.org
Cc: linux-mips@linux-mips.org,
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/4751/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/cpufreq/loongson2_cpufreq.c

index bb51d3193ad4e0ea6803477903327b1bcaf6cd56..3237c5235f9c56f73c0be59aa7b5d9c6143794e2 100644 (file)
@@ -107,6 +107,8 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
 static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
        int i;
+       unsigned long rate;
+       int ret;
 
        if (!cpu_online(policy->cpu))
                return -ENODEV;
@@ -117,15 +119,22 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
                return PTR_ERR(cpuclk);
        }
 
-       cpuclk->rate = cpu_clock_freq / 1000;
-       if (!cpuclk->rate)
+       rate = cpu_clock_freq / 1000;
+       if (!rate) {
+               clk_put(cpuclk);
                return -EINVAL;
+       }
+       ret = clk_set_rate(cpuclk, rate);
+       if (ret) {
+               clk_put(cpuclk);
+               return ret;
+       }
 
        /* clock table init */
        for (i = 2;
             (loongson2_clockmod_table[i].frequency != CPUFREQ_TABLE_END);
             i++)
-               loongson2_clockmod_table[i].frequency = (cpuclk->rate * i) / 8;
+               loongson2_clockmod_table[i].frequency = (rate * i) / 8;
 
        policy->cur = loongson2_cpufreq_get(policy->cpu);