cpufreq: mediatek: Use device print to show logs

- Replace pr_* with dev_* to show logs.
- Remove usage of __func__.

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 dc4a87e..e040f35 100644 (file)
--- a/drivers/cpufreq/mediatek-cpufreq.c
+++ b/drivers/cpufreq/mediatek-cpufreq.c
@@ -65,7 +65,8 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info,
 
        old_vproc = regulator_get_voltage(proc_reg);
        if (old_vproc < 0) {
-               pr_err("%s: invalid Vproc value: %d\n", __func__, old_vproc);
+               dev_err(info->cpu_dev,
+                       "invalid Vproc value: %d\n", old_vproc);
                return old_vproc;
        }
        /* Vsram should not exceed the maximum allowed voltage of SoC. */
@@ -81,14 +82,14 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info,
                do {
                        old_vsram = regulator_get_voltage(sram_reg);
                        if (old_vsram < 0) {
-                               pr_err("%s: invalid Vsram value: %d\n",
-                                      __func__, old_vsram);
+                               dev_err(info->cpu_dev,
+                                       "invalid Vsram value: %d\n", old_vsram);
                                return old_vsram;
                        }
                        old_vproc = regulator_get_voltage(proc_reg);
                        if (old_vproc < 0) {
-                               pr_err("%s: invalid Vproc value: %d\n",
-                                      __func__, old_vproc);
+                               dev_err(info->cpu_dev,
+                                       "invalid Vproc value: %d\n", old_vproc);
                                return old_vproc;
                        }
 
@@ -136,14 +137,14 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info,
                do {
                        old_vproc = regulator_get_voltage(proc_reg);
                        if (old_vproc < 0) {
-                               pr_err("%s: invalid Vproc value: %d\n",
-                                      __func__, old_vproc);
+                               dev_err(info->cpu_dev,
+                                       "invalid Vproc value: %d\n", old_vproc);
                                return old_vproc;
                        }
                        old_vsram = regulator_get_voltage(sram_reg);
                        if (old_vsram < 0) {
-                               pr_err("%s: invalid Vsram value: %d\n",
-                                      __func__, old_vsram);
+                               dev_err(info->cpu_dev,
+                                       "invalid Vsram value: %d\n", old_vsram);
                                return old_vsram;
                        }
 
@@ -214,7 +215,7 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
        old_freq_hz = clk_get_rate(cpu_clk);
        old_vproc = regulator_get_voltage(info->proc_reg);
        if (old_vproc < 0) {
-               pr_err("%s: invalid Vproc value: %d\n", __func__, old_vproc);
+               dev_err(cpu_dev, "invalid Vproc value: %d\n", old_vproc);
                return old_vproc;
        }
 
@@ -222,8 +223,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
 
        opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_hz);
        if (IS_ERR(opp)) {
-               pr_err("cpu%d: failed to find OPP for %ld\n",
-                      policy->cpu, freq_hz);
+               dev_err(cpu_dev, "cpu%d: failed to find OPP for %ld\n",
+                       policy->cpu, freq_hz);
                return PTR_ERR(opp);
        }
        vproc = dev_pm_opp_get_voltage(opp);
@@ -237,8 +238,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
        if (old_vproc < target_vproc) {
                ret = mtk_cpufreq_set_voltage(info, target_vproc);
                if (ret) {
-                       pr_err("cpu%d: failed to scale up voltage!\n",
-                              policy->cpu);
+                       dev_err(cpu_dev,
+                               "cpu%d: failed to scale up voltage!\n", policy->cpu);
                        mtk_cpufreq_set_voltage(info, old_vproc);
                        return ret;
                }
@@ -247,8 +248,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
        /* Reparent the CPU clock to intermediate clock. */
        ret = clk_set_parent(cpu_clk, info->inter_clk);
        if (ret) {
-               pr_err("cpu%d: failed to re-parent cpu clock!\n",
-                      policy->cpu);
+               dev_err(cpu_dev,
+                       "cpu%d: failed to re-parent cpu clock!\n", policy->cpu);
                mtk_cpufreq_set_voltage(info, old_vproc);
                WARN_ON(1);
                return ret;
@@ -257,8 +258,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
        /* Set the original PLL to target rate. */
        ret = clk_set_rate(armpll, freq_hz);
        if (ret) {
-               pr_err("cpu%d: failed to scale cpu clock rate!\n",
-                      policy->cpu);
+               dev_err(cpu_dev,
+                       "cpu%d: failed to scale cpu clock rate!\n", policy->cpu);
                clk_set_parent(cpu_clk, armpll);
                mtk_cpufreq_set_voltage(info, old_vproc);
                return ret;
@@ -267,8 +268,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
        /* Set parent of CPU clock back to the original PLL. */
        ret = clk_set_parent(cpu_clk, armpll);
        if (ret) {
-               pr_err("cpu%d: failed to re-parent cpu clock!\n",
-                      policy->cpu);
+               dev_err(cpu_dev,
+                       "cpu%d: failed to re-parent cpu clock!\n", policy->cpu);
                mtk_cpufreq_set_voltage(info, inter_vproc);
                WARN_ON(1);
                return ret;
@@ -281,8 +282,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
        if (vproc < inter_vproc || vproc < old_vproc) {
                ret = mtk_cpufreq_set_voltage(info, vproc);
                if (ret) {
-                       pr_err("cpu%d: failed to scale down voltage!\n",
-                              policy->cpu);
+                       dev_err(cpu_dev,
+                               "cpu%d: failed to scale down voltage!\n", policy->cpu);
                        clk_set_parent(cpu_clk, info->inter_clk);
                        clk_set_rate(armpll, old_freq_hz);
                        clk_set_parent(cpu_clk, armpll);
@@ -448,15 +449,16 @@ static int mtk_cpufreq_init(struct cpufreq_policy *policy)
 
        info = mtk_cpu_dvfs_info_lookup(policy->cpu);
        if (!info) {
-               pr_err("dvfs info for cpu%d is not initialized.\n",
-                      policy->cpu);
+               dev_err(info->cpu_dev,
+                       "dvfs info for cpu%d is not initialized.\n", policy->cpu);
                return -EINVAL;
        }
 
        ret = dev_pm_opp_init_cpufreq_table(info->cpu_dev, &freq_table);
        if (ret) {
-               pr_err("failed to init cpufreq table for cpu%d: %d\n",
-                      policy->cpu, ret);
+               dev_err(info->cpu_dev,
+                       "failed to init cpufreq table for cpu%d: %d\n",
+                       policy->cpu, ret);
                return ret;
        }