Merge tag 'Wimplicit-fallthrough-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kerne...

[linux.git] / drivers / cpufreq / bmips-cpufreq.c

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 = {