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: Viresh Kumar <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>

diff --git a/drivers/cpufreq/bmips-cpufreq.c b/drivers/cpufreq/bmips-cpufreq.c
index 56a4ebbf00e02479b17cb3eb4efc1d2c830adefd..f7c23fa468f0b89246b23af3b8263152cfaf235d 100644 (file)
--- a/drivers/cpufreq/bmips-cpufreq.c
+++ b/drivers/cpufreq/bmips-cpufreq.c
@@ -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
-               pr_info("%s: registered\n", BMIPS_CPUFREQ_NAME);
+       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 = {

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 99aa7d20b4583ff8598b164363695bd845e1ea8f..efab334d6ab2964cd23e367a96e26a33dd5a44d3 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -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);
 

diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c
index 940fe85db97a58df7d3eac9732f51fb865d4f6d8..664fa4ab9d1c414cadf1a0835044c028a1dad9ec 100644 (file)
--- a/drivers/cpufreq/davinci-cpufreq.c
+++ b/drivers/cpufreq/davinci-cpufreq.c
@@ -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 = {

diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 3e17560b1efe366fc0e64853efc6c832ed452f70..91ea95c97bb2b1d795edf4d24f86d766dd1a2482 100644 (file)
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -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 = {

diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 7ab564c1f7aeb782abd8b13b590a8ac1e45e3e5a..cb74bdc5baaa40a2ecff1ce0fe11d528a8585f32 100644 (file)
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -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 = {

diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
index 21c9ce8526c04b97398d12824f8d3827c7782b17..0ea88778882ac93048320d8def6f18867e25077a 100644 (file)
--- a/drivers/cpufreq/loongson1-cpufreq.c
+++ b/drivers/cpufreq/loongson1-cpufreq.c
@@ -81,7 +81,7 @@ static int ls1x_cpufreq_init(struct cpufreq_policy *policy)
        struct device *cpu_dev = get_cpu_device(policy->cpu);
        struct cpufreq_frequency_table *freq_tbl;
        unsigned int pll_freq, freq;
-       int steps, i, ret;
+       int steps, i;
 
        pll_freq = clk_get_rate(cpufreq->pll_clk) / 1000;
 
@@ -103,11 +103,9 @@ static int ls1x_cpufreq_init(struct cpufreq_policy *policy)
        freq_tbl[i].frequency = CPUFREQ_TABLE_END;
 
        policy->clk = cpufreq->clk;
-       ret = cpufreq_generic_init(policy, freq_tbl, 0);
-       if (ret)
-               kfree(freq_tbl);
+       cpufreq_generic_init(policy, freq_tbl, 0);
 
-       return ret;
+       return 0;
 }
 
 static int ls1x_cpufreq_exit(struct cpufreq_policy *policy)

diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index da344696beed7ff611a40c58582ffcf39bc79d2d..890813e0bb768011ea31db35c97317091a25bc0a 100644 (file)
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -95,7 +95,8 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
        }
 
        policy->clk = cpuclk;
-       return cpufreq_generic_init(policy, &loongson2_clockmod_table[0], 0);
+       cpufreq_generic_init(policy, &loongson2_clockmod_table[0], 0);
+       return 0;
 }
 
 static int loongson2_cpufreq_exit(struct cpufreq_policy *policy)

diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c
index a94355723ef85780d347126b0d41bb70b0380446..a03cd3ad170f8afb23a41420d72f84892197e832 100644 (file)
--- a/drivers/cpufreq/maple-cpufreq.c
+++ b/drivers/cpufreq/maple-cpufreq.c
@@ -143,7 +143,8 @@ static unsigned int maple_cpufreq_get_speed(unsigned int cpu)
 
 static int maple_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-       return cpufreq_generic_init(policy, maple_cpu_freqs, 12000);
+       cpufreq_generic_init(policy, maple_cpu_freqs, 12000);
+       return 0;
 }
 
 static struct cpufreq_driver maple_cpufreq_driver = {

diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 68052b74d28fcfc80e6cce5e8c67f2233b18f454..edda20119cfdd17a23f080e8a76cbaa9fbedc2d4 100644 (file)
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -125,23 +125,18 @@ static int omap_cpu_init(struct cpufreq_policy *policy)
                        dev_err(mpu_dev,
                                "%s: cpu%d: failed creating freq table[%d]\n",
                                __func__, policy->cpu, result);
-                       goto fail;
+                       clk_put(policy->clk);
+                       return result;
                }
        }
 
        atomic_inc_return(&freq_table_users);
 
        /* FIXME: what's the actual transition time? */
-       result = cpufreq_generic_init(policy, freq_table, 300 * 1000);
-       if (!result) {
-               dev_pm_opp_of_register_em(policy->cpus);
-               return 0;
-       }
+       cpufreq_generic_init(policy, freq_table, 300 * 1000);
+       dev_pm_opp_of_register_em(policy->cpus);
 
-       freq_table_free();
-fail:
-       clk_put(policy->clk);
-       return result;
+       return 0;
 }
 
 static int omap_cpu_exit(struct cpufreq_policy *policy)

diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
index 6b1e4abe32483d80f0af0db9cb0db43cc4a3dcfa..93f39a1d4c3de064f93acd8b0757f4d655458f93 100644 (file)
--- a/drivers/cpufreq/pasemi-cpufreq.c
+++ b/drivers/cpufreq/pasemi-cpufreq.c
@@ -196,7 +196,8 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy)
        policy->cur = pas_freqs[cur_astate].frequency;
        ppc_proc_freq = policy->cur * 1000ul;
 
-       return cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency());
+       cpufreq_generic_init(policy, pas_freqs, get_gizmo_latency());
+       return 0;
 
 out_unmap_sdcpwr:
        iounmap(sdcpwr_mapbase);

diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c
index 9b4ce2eb8222c0bc85aadcf67056774b1a556173..bc7fc930294ed1d98314895c176d16972608ec4e 100644 (file)
--- a/drivers/cpufreq/pmac32-cpufreq.c
+++ b/drivers/cpufreq/pmac32-cpufreq.c
@@ -376,7 +376,8 @@ static int pmac_cpufreq_target(     struct cpufreq_policy *policy,
 
 static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-       return cpufreq_generic_init(policy, pmac_cpu_freqs, transition_latency);
+       cpufreq_generic_init(policy, pmac_cpu_freqs, transition_latency);
+       return 0;
 }
 
 static u32 read_gpio(struct device_node *np)

diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 1d32a863332d3135dbaf14da48b3c957db8ed0f4..045881494cc928499fbaaed84ef5c39deb6ed715 100644 (file)
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -324,7 +324,8 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu)
 
 static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-       return cpufreq_generic_init(policy, g5_cpu_freqs, transition_latency);
+       cpufreq_generic_init(policy, g5_cpu_freqs, transition_latency);
+       return 0;
 }
 
 static struct cpufreq_driver g5_cpufreq_driver = {

diff --git a/drivers/cpufreq/s3c2416-cpufreq.c b/drivers/cpufreq/s3c2416-cpufreq.c
index 5b2db3c6568f691429fce3d636ac955e06b0bec9..124a4c68c5ec0178b67b7cee63679c396c1411ce 100644 (file)
--- a/drivers/cpufreq/s3c2416-cpufreq.c
+++ b/drivers/cpufreq/s3c2416-cpufreq.c
@@ -450,21 +450,16 @@ static int s3c2416_cpufreq_driver_init(struct cpufreq_policy *policy)
        /* Datasheet says PLL stabalisation time must be at least 300us,
         * so but add some fudge. (reference in LOCKCON0 register description)
         */
-       ret = cpufreq_generic_init(policy, s3c_freq->freq_table,
+       cpufreq_generic_init(policy, s3c_freq->freq_table,
                        (500 * 1000) + s3c_freq->regulator_latency);
-       if (ret)
-               goto err_freq_table;
-
        register_reboot_notifier(&s3c2416_cpufreq_reboot_notifier);
 
        return 0;
 
-err_freq_table:
 #ifdef CONFIG_ARM_S3C2416_CPUFREQ_VCORESCALE
-       regulator_put(s3c_freq->vddarm);
 err_vddarm:
-#endif
        clk_put(s3c_freq->armclk);
+#endif
 err_armclk:
        clk_put(s3c_freq->hclk);
 err_hclk:

diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index 0cb9040eca49c3c84fb852f674f649f213bfd3e7..40aafa8299a0fd0c9a1b1289a733f4894f82981b 100644 (file)
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -147,7 +147,6 @@ out:
 
 static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
 {
-       int ret;
        struct cpufreq_frequency_table *freq;
 
        if (policy->cpu != 0)
@@ -168,8 +167,7 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
 #ifdef CONFIG_REGULATOR
        vddarm = regulator_get(NULL, "vddarm");
        if (IS_ERR(vddarm)) {
-               ret = PTR_ERR(vddarm);
-               pr_err("Failed to obtain VDDARM: %d\n", ret);
+               pr_err("Failed to obtain VDDARM: %ld\n", PTR_ERR(vddarm));
                pr_err("Only frequency scaling available\n");
                vddarm = NULL;
        } else {
@@ -199,16 +197,9 @@ static int s3c64xx_cpufreq_driver_init(struct cpufreq_policy *policy)
         * the PLLs, which we don't currently) is ~300us worst case,
         * but add some fudge.
         */
-       ret = cpufreq_generic_init(policy, s3c64xx_freq_table,
+       cpufreq_generic_init(policy, s3c64xx_freq_table,
                        (500 * 1000) + regulator_latency);
-       if (ret != 0) {
-               pr_err("Failed to configure frequency table: %d\n",
-                      ret);
-               regulator_put(vddarm);
-               clk_put(policy->clk);
-       }
-
-       return ret;
+       return 0;
 }
 
 static struct cpufreq_driver s3c64xx_cpufreq_driver = {

diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index c7b7d1e65b086dfdfcc9c7772500ac03655eca64..0663cc935fa61836d40ff46c7e3f194e4284cff7 100644 (file)
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -544,7 +544,8 @@ static int s5pv210_cpu_init(struct cpufreq_policy *policy)
        s5pv210_dram_conf[1].freq = clk_get_rate(dmc1_clk);
 
        policy->suspend_freq = SLEEP_FREQ;
-       return cpufreq_generic_init(policy, s5pv210_freq_table, 40000);
+       cpufreq_generic_init(policy, s5pv210_freq_table, 40000);
+       return 0;
 
 out_dmc1:
        clk_put(dmc0_clk);

diff --git a/drivers/cpufreq/sa1100-cpufreq.c b/drivers/cpufreq/sa1100-cpufreq.c
index ab5cab93e638632fc7dd26d565da1454113e0a8f..5c075ef6adc0831090987a40a7e40214feef2b79 100644 (file)
--- a/drivers/cpufreq/sa1100-cpufreq.c
+++ b/drivers/cpufreq/sa1100-cpufreq.c
@@ -181,7 +181,8 @@ static int sa1100_target(struct cpufreq_policy *policy, unsigned int ppcr)
 
 static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
 {
-       return cpufreq_generic_init(policy, sa11x0_freq_table, 0);
+       cpufreq_generic_init(policy, sa11x0_freq_table, 0);
+       return 0;
 }
 
 static struct cpufreq_driver sa1100_driver __refdata = {

diff --git a/drivers/cpufreq/sa1110-cpufreq.c b/drivers/cpufreq/sa1110-cpufreq.c
index 66e5fb088ecca76c6d62065ea11a15ce01d488db..1057d7f65118d8e38a6af46d57431014bb8ad931 100644 (file)
--- a/drivers/cpufreq/sa1110-cpufreq.c
+++ b/drivers/cpufreq/sa1110-cpufreq.c
@@ -306,7 +306,8 @@ static int sa1110_target(struct cpufreq_policy *policy, unsigned int ppcr)
 
 static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
 {
-       return cpufreq_generic_init(policy, sa11x0_freq_table, 0);
+       cpufreq_generic_init(policy, sa11x0_freq_table, 0);
+       return 0;
 }
 
 /* sa1110_driver needs __refdata because it must remain after init registers

diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index 4074e261552238ccbcdad859944f85a3effac1be..73bd8dc47074200dd90472089a4fd928440e5b7e 100644 (file)
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -153,8 +153,9 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
 static int spear_cpufreq_init(struct cpufreq_policy *policy)
 {
        policy->clk = spear_cpufreq.clk;
-       return cpufreq_generic_init(policy, spear_cpufreq.freq_tbl,
+       cpufreq_generic_init(policy, spear_cpufreq.freq_tbl,
                        spear_cpufreq.transition_latency);
+       return 0;
 }
 
 static struct cpufreq_driver spear_cpufreq_driver = {

diff --git a/drivers/cpufreq/tegra20-cpufreq.c b/drivers/cpufreq/tegra20-cpufreq.c
index 3c32cc7b06717286c6a35a73b5ec52a504eba27d..f84ecd22f488612f9c3a2aa8637c6ffd581094f0 100644 (file)
--- a/drivers/cpufreq/tegra20-cpufreq.c
+++ b/drivers/cpufreq/tegra20-cpufreq.c
@@ -118,17 +118,11 @@ static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
 static int tegra_cpu_init(struct cpufreq_policy *policy)
 {
        struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data();
-       int ret;
 
        clk_prepare_enable(cpufreq->cpu_clk);
 
        /* FIXME: what's the actual transition time? */
-       ret = cpufreq_generic_init(policy, freq_table, 300 * 1000);
-       if (ret) {
-               clk_disable_unprepare(cpufreq->cpu_clk);
-               return ret;
-       }
-
+       cpufreq_generic_init(policy, freq_table, 300 * 1000);
        policy->clk = cpufreq->cpu_clk;
        policy->suspend_freq = freq_table[0].frequency;
        return 0;

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index afc683021ac56b099bef30f9ec27caa15e1a243c..441ff15b7768e72e94dcca47240684303ebaf3a8 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -995,7 +995,7 @@ extern struct freq_attr *cpufreq_generic_attr[];
 int cpufreq_table_validate_and_sort(struct cpufreq_policy *policy);
 
 unsigned int cpufreq_generic_get(unsigned int cpu);
-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);
 #endif /* _LINUX_CPUFREQ_H */