cpufreq: mediatek: Cleanup variables and error handling in mtk_cpu_dvfs_info_init()

- Remove several unnecessary varaibles in mtk_cpu_dvfs_info_init().
- Unify error message format and use dev_err_probe() if possible.

Signed-off-by: Jia-Wei Chang <jia-wei.chang@mediatek.com>
Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c
index 9d7d9c8dc184bc9da94a5b75614e2d2b6b9d5918..e0545aca7e41b3f1ba1a91cad099b840c0edba92 100644 (file)
--- a/drivers/cpufreq/mediatek-cpufreq.c
+++ b/drivers/cpufreq/mediatek-cpufreq.c
@@ -300,96 +300,75 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
 static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)
 {
        struct device *cpu_dev;
-       struct regulator *proc_reg = ERR_PTR(-ENODEV);
-       struct regulator *sram_reg = ERR_PTR(-ENODEV);
-       struct clk *cpu_clk = ERR_PTR(-ENODEV);
-       struct clk *inter_clk = ERR_PTR(-ENODEV);
        struct dev_pm_opp *opp;
        unsigned long rate;
        int ret;
 
        cpu_dev = get_cpu_device(cpu);
        if (!cpu_dev) {
-               pr_err("failed to get cpu%d device\n", cpu);
+               dev_err(cpu_dev, "failed to get cpu%d device\n", cpu);
                return -ENODEV;
        }
+       info->cpu_dev = cpu_dev;
 
-       cpu_clk = clk_get(cpu_dev, "cpu");
-       if (IS_ERR(cpu_clk)) {
-               if (PTR_ERR(cpu_clk) == -EPROBE_DEFER)
-                       pr_warn("cpu clk for cpu%d not ready, retry.\n", cpu);
-               else
-                       pr_err("failed to get cpu clk for cpu%d\n", cpu);
-
-               ret = PTR_ERR(cpu_clk);
-               return ret;
+       info->cpu_clk = clk_get(cpu_dev, "cpu");
+       if (IS_ERR(info->cpu_clk)) {
+               ret = PTR_ERR(info->cpu_clk);
+               return dev_err_probe(cpu_dev, ret,
+                                    "cpu%d: failed to get cpu clk\n", cpu);
        }
 
-       inter_clk = clk_get(cpu_dev, "intermediate");
-       if (IS_ERR(inter_clk)) {
-               if (PTR_ERR(inter_clk) == -EPROBE_DEFER)
-                       pr_warn("intermediate clk for cpu%d not ready, retry.\n",
-                               cpu);
-               else
-                       pr_err("failed to get intermediate clk for cpu%d\n",
-                              cpu);
-
-               ret = PTR_ERR(inter_clk);
+       info->inter_clk = clk_get(cpu_dev, "intermediate");
+       if (IS_ERR(info->inter_clk)) {
+               ret = PTR_ERR(info->inter_clk);
+               dev_err_probe(cpu_dev, ret,
+                             "cpu%d: failed to get intermediate clk\n", cpu);
                goto out_free_resources;
        }
 
-       proc_reg = regulator_get_optional(cpu_dev, "proc");
-       if (IS_ERR(proc_reg)) {
-               if (PTR_ERR(proc_reg) == -EPROBE_DEFER)
-                       pr_warn("proc regulator for cpu%d not ready, retry.\n",
-                               cpu);
-               else
-                       pr_err("failed to get proc regulator for cpu%d\n",
-                              cpu);
-
-               ret = PTR_ERR(proc_reg);
+       info->proc_reg = regulator_get_optional(cpu_dev, "proc");
+       if (IS_ERR(info->proc_reg)) {
+               ret = PTR_ERR(info->proc_reg);
+               dev_err_probe(cpu_dev, ret,
+                             "cpu%d: failed to get proc regulator\n", cpu);
                goto out_free_resources;
        }
 
        /* Both presence and absence of sram regulator are valid cases. */
-       sram_reg = regulator_get_exclusive(cpu_dev, "sram");
+       info->sram_reg = regulator_get_exclusive(cpu_dev, "sram");
+       if (IS_ERR(info->sram_reg))
+               info->sram_reg = NULL;
 
        /* Get OPP-sharing information from "operating-points-v2" bindings */
        ret = dev_pm_opp_of_get_sharing_cpus(cpu_dev, &info->cpus);
        if (ret) {
-               pr_err("failed to get OPP-sharing information for cpu%d\n",
-                      cpu);
+               dev_err(cpu_dev,
+                       "cpu%d: failed to get OPP-sharing information\n", cpu);
                goto out_free_resources;
        }
 
        ret = dev_pm_opp_of_cpumask_add_table(&info->cpus);
        if (ret) {
-               pr_warn("no OPP table for cpu%d\n", cpu);
+               dev_warn(cpu_dev, "cpu%d: no OPP table\n", cpu);
                goto out_free_resources;
        }
 
        /* Search a safe voltage for intermediate frequency. */
-       rate = clk_get_rate(inter_clk);
+       rate = clk_get_rate(info->inter_clk);
        opp = dev_pm_opp_find_freq_ceil(cpu_dev, &rate);
        if (IS_ERR(opp)) {
-               pr_err("failed to get intermediate opp for cpu%d\n", cpu);
+               dev_err(cpu_dev, "cpu%d: failed to get intermediate opp\n", cpu);
                ret = PTR_ERR(opp);
                goto out_free_opp_table;
        }
        info->intermediate_voltage = dev_pm_opp_get_voltage(opp);
        dev_pm_opp_put(opp);
 
-       info->cpu_dev = cpu_dev;
-       info->proc_reg = proc_reg;
-       info->sram_reg = IS_ERR(sram_reg) ? NULL : sram_reg;
-       info->cpu_clk = cpu_clk;
-       info->inter_clk = inter_clk;
-
        /*
         * If SRAM regulator is present, software "voltage tracking" is needed
         * for this CPU power domain.
         */
-       info->need_voltage_tracking = !IS_ERR(sram_reg);
+       info->need_voltage_tracking = (info->sram_reg != NULL);
 
        return 0;
 
@@ -397,14 +376,14 @@ out_free_opp_table:
        dev_pm_opp_of_cpumask_remove_table(&info->cpus);
 
 out_free_resources:
-       if (!IS_ERR(proc_reg))
-               regulator_put(proc_reg);
-       if (!IS_ERR(sram_reg))
-               regulator_put(sram_reg);
-       if (!IS_ERR(cpu_clk))
-               clk_put(cpu_clk);
-       if (!IS_ERR(inter_clk))
-               clk_put(inter_clk);
+       if (!IS_ERR(info->proc_reg))
+               regulator_put(info->proc_reg);
+       if (!IS_ERR(info->sram_reg))
+               regulator_put(info->sram_reg);
+       if (!IS_ERR(info->cpu_clk))
+               clk_put(info->cpu_clk);
+       if (!IS_ERR(info->inter_clk))
+               clk_put(info->inter_clk);
 
        return ret;
 }