cpufreq: dbx500: Minor code cleanup

Some minor code cleanup and some minor changes to printed
error messages.

Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index d974a8e..d4cb782 100644 (file)
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -36,6 +36,7 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
 {
        struct cpufreq_freqs freqs;
        unsigned int idx;
 {
        struct cpufreq_freqs freqs;
        unsigned int idx;

+       int ret;

 
        /* scale the target frequency to one of the extremes supported */
        if (target_freq < policy->cpuinfo.min_freq)
 
        /* scale the target frequency to one of the extremes supported */
        if (target_freq < policy->cpuinfo.min_freq)


@@ -44,10 +45,9 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
                target_freq = policy->cpuinfo.max_freq;
 
        /* Lookup the next frequency */
                target_freq = policy->cpuinfo.max_freq;
 
        /* Lookup the next frequency */

-       if (cpufreq_frequency_table_target
-           (policy, freq_table, target_freq, relation, &idx)) {
+       if (cpufreq_frequency_table_target(policy, freq_table, target_freq,
+                                       relation, &idx))

                return -EINVAL;
                return -EINVAL;

-       }

 
        freqs.old = policy->cur;
        freqs.new = freq_table[idx].frequency;
 
        freqs.old = policy->cur;
        freqs.new = freq_table[idx].frequency;


@@ -60,9 +60,12 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
 
        /* update armss clk frequency */
                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
 
        /* update armss clk frequency */

-       if (clk_set_rate(armss_clk, freq_table[idx].frequency * 1000)) {
-               pr_err("dbx500-cpufreq: Failed to update armss clk\n");
-               return -EINVAL;
+       ret = clk_set_rate(armss_clk, freqs.new * 1000);
+
+       if (ret) {
+               pr_err("dbx500-cpufreq: Failed to set armss_clk to %d Hz: error %d\n",
+                      freqs.new * 1000, ret);
+               return ret;

        }
 
        /* post change notification */
        }
 
        /* post change notification */


@@ -97,7 +100,7 @@ static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
        if (!res)
                cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
        else {
        if (!res)
                cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
        else {

-               pr_err("dbx500-cpufreq : Failed to read policy table\n");
+               pr_err("dbx500-cpufreq: Failed to read policy table\n");

                return res;
        }
 
                return res;
        }
 


@@ -143,11 +146,11 @@ static int dbx500_cpufreq_probe(struct platform_device *pdev)
 
        armss_clk = clk_get(&pdev->dev, "armss");
        if (IS_ERR(armss_clk)) {
 
        armss_clk = clk_get(&pdev->dev, "armss");
        if (IS_ERR(armss_clk)) {

-               pr_err("dbx500-cpufreq : Failed to get armss clk\n");
+               pr_err("dbx500-cpufreq: Failed to get armss clk\n");

                return PTR_ERR(armss_clk);
        }
 
                return PTR_ERR(armss_clk);
        }
 

-       pr_info("dbx500-cpufreq : Available frequencies:\n");
+       pr_info("dbx500-cpufreq: Available frequencies:\n");

        while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
                pr_info("  %d Mhz\n", freq_table[i].frequency/1000);
                i++;
        while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
                pr_info("  %d Mhz\n", freq_table[i].frequency/1000);
                i++;


@@ -169,7 +172,6 @@ static int __init dbx500_cpufreq_register(void)
        if (!cpu_is_u8500_family())
                return -ENODEV;
 
        if (!cpu_is_u8500_family())
                return -ENODEV;
 

-       pr_info("cpufreq for DBX500 started\n");

        return platform_driver_register(&dbx500_cpufreq_plat_driver);
 }
 device_initcall(dbx500_cpufreq_register);
        return platform_driver_register(&dbx500_cpufreq_plat_driver);
 }
 device_initcall(dbx500_cpufreq_register);