1 From a02e2b359141035d2d6999940bc1b9f83ec88587 Mon Sep 17 00:00:00 2001
2 From: Rex-BC Chen <rex-bc.chen@mediatek.com>
3 Date: Fri, 22 Apr 2022 15:52:27 +0800
4 Subject: [PATCH 04/21] cpufreq: mediatek: Use device print to show logs
6 - Replace pr_* with dev_* to show logs.
7 - Remove usage of __func__.
9 Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
10 Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
11 Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
13 drivers/cpufreq/mediatek-cpufreq.c | 54 ++++++++++++++++--------------
14 1 file changed, 28 insertions(+), 26 deletions(-)
16 --- a/drivers/cpufreq/mediatek-cpufreq.c
17 +++ b/drivers/cpufreq/mediatek-cpufreq.c
18 @@ -67,7 +67,8 @@ static int mtk_cpufreq_voltage_tracking(
20 old_vproc = regulator_get_voltage(proc_reg);
22 - pr_err("%s: invalid Vproc value: %d\n", __func__, old_vproc);
23 + dev_err(info->cpu_dev,
24 + "invalid Vproc value: %d\n", old_vproc);
27 /* Vsram should not exceed the maximum allowed voltage of SoC. */
28 @@ -83,14 +84,14 @@ static int mtk_cpufreq_voltage_tracking(
30 old_vsram = regulator_get_voltage(sram_reg);
32 - pr_err("%s: invalid Vsram value: %d\n",
33 - __func__, old_vsram);
34 + dev_err(info->cpu_dev,
35 + "invalid Vsram value: %d\n", old_vsram);
38 old_vproc = regulator_get_voltage(proc_reg);
40 - pr_err("%s: invalid Vproc value: %d\n",
41 - __func__, old_vproc);
42 + dev_err(info->cpu_dev,
43 + "invalid Vproc value: %d\n", old_vproc);
47 @@ -138,14 +139,14 @@ static int mtk_cpufreq_voltage_tracking(
49 old_vproc = regulator_get_voltage(proc_reg);
51 - pr_err("%s: invalid Vproc value: %d\n",
52 - __func__, old_vproc);
53 + dev_err(info->cpu_dev,
54 + "invalid Vproc value: %d\n", old_vproc);
57 old_vsram = regulator_get_voltage(sram_reg);
59 - pr_err("%s: invalid Vsram value: %d\n",
60 - __func__, old_vsram);
61 + dev_err(info->cpu_dev,
62 + "invalid Vsram value: %d\n", old_vsram);
66 @@ -216,7 +217,7 @@ static int mtk_cpufreq_set_target(struct
67 old_freq_hz = clk_get_rate(cpu_clk);
68 old_vproc = regulator_get_voltage(info->proc_reg);
70 - pr_err("%s: invalid Vproc value: %d\n", __func__, old_vproc);
71 + dev_err(cpu_dev, "invalid Vproc value: %d\n", old_vproc);
75 @@ -224,8 +225,8 @@ static int mtk_cpufreq_set_target(struct
77 opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_hz);
79 - pr_err("cpu%d: failed to find OPP for %ld\n",
80 - policy->cpu, freq_hz);
81 + dev_err(cpu_dev, "cpu%d: failed to find OPP for %ld\n",
82 + policy->cpu, freq_hz);
85 vproc = dev_pm_opp_get_voltage(opp);
86 @@ -239,8 +240,8 @@ static int mtk_cpufreq_set_target(struct
87 if (old_vproc < target_vproc) {
88 ret = mtk_cpufreq_set_voltage(info, target_vproc);
90 - pr_err("cpu%d: failed to scale up voltage!\n",
93 + "cpu%d: failed to scale up voltage!\n", policy->cpu);
94 mtk_cpufreq_set_voltage(info, old_vproc);
97 @@ -249,8 +250,8 @@ static int mtk_cpufreq_set_target(struct
98 /* Reparent the CPU clock to intermediate clock. */
99 ret = clk_set_parent(cpu_clk, info->inter_clk);
101 - pr_err("cpu%d: failed to re-parent cpu clock!\n",
104 + "cpu%d: failed to re-parent cpu clock!\n", policy->cpu);
105 mtk_cpufreq_set_voltage(info, old_vproc);
108 @@ -259,8 +260,8 @@ static int mtk_cpufreq_set_target(struct
109 /* Set the original PLL to target rate. */
110 ret = clk_set_rate(armpll, freq_hz);
112 - pr_err("cpu%d: failed to scale cpu clock rate!\n",
115 + "cpu%d: failed to scale cpu clock rate!\n", policy->cpu);
116 clk_set_parent(cpu_clk, armpll);
117 mtk_cpufreq_set_voltage(info, old_vproc);
119 @@ -269,8 +270,8 @@ static int mtk_cpufreq_set_target(struct
120 /* Set parent of CPU clock back to the original PLL. */
121 ret = clk_set_parent(cpu_clk, armpll);
123 - pr_err("cpu%d: failed to re-parent cpu clock!\n",
126 + "cpu%d: failed to re-parent cpu clock!\n", policy->cpu);
127 mtk_cpufreq_set_voltage(info, inter_vproc);
130 @@ -283,8 +284,8 @@ static int mtk_cpufreq_set_target(struct
131 if (vproc < inter_vproc || vproc < old_vproc) {
132 ret = mtk_cpufreq_set_voltage(info, vproc);
134 - pr_err("cpu%d: failed to scale down voltage!\n",
137 + "cpu%d: failed to scale down voltage!\n", policy->cpu);
138 clk_set_parent(cpu_clk, info->inter_clk);
139 clk_set_rate(armpll, old_freq_hz);
140 clk_set_parent(cpu_clk, armpll);
141 @@ -450,15 +451,16 @@ static int mtk_cpufreq_init(struct cpufr
143 info = mtk_cpu_dvfs_info_lookup(policy->cpu);
145 - pr_err("dvfs info for cpu%d is not initialized.\n",
147 + dev_err(info->cpu_dev,
148 + "dvfs info for cpu%d is not initialized.\n", policy->cpu);
152 ret = dev_pm_opp_init_cpufreq_table(info->cpu_dev, &freq_table);
154 - pr_err("failed to init cpufreq table for cpu%d: %d\n",
156 + dev_err(info->cpu_dev,
157 + "failed to init cpufreq table for cpu%d: %d\n",