Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a6a434124457fe64bb3980ceb2170505207db6e5

Authored by Mark Brown
Committed by Dave Jones
1 parent b191c54029
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[CPUFREQ] s3c64xx: Use pr_fmt() for consistent log messages 

They're already consistent but it saves remembering to do so.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dave Jones <davej@redhat.com>

Showing 1 changed file with 22 additions and 13 deletions Side-by-side Diff

drivers/cpufreq/s3c64xx-cpufreq.c
Diff comments   View file @ a6a4341
... ... @@ -8,6 +8,8 @@
8 8 * published by the Free Software Foundation.
9 9 */
10 10  
  11 +#define pr_fmt(fmt) "cpufreq: " fmt
  12 +
11 13 #include <linux/kernel.h>
12 14 #include <linux/types.h>
13 15 #include <linux/init.h>
... ... @@ -91,7 +93,7 @@
91 93 if (freqs.old == freqs.new)
92 94 return 0;
93 95  
94   - pr_debug("cpufreq: Transition %d-%dkHz\n", freqs.old, freqs.new);
  96 + pr_debug("Transition %d-%dkHz\n", freqs.old, freqs.new);
95 97  
96 98 cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
97 99  
... ... @@ -101,7 +103,7 @@
101 103 dvfs->vddarm_min,
102 104 dvfs->vddarm_max);
103 105 if (ret != 0) {
104   - pr_err("cpufreq: Failed to set VDDARM for %dkHz: %d\n",
  106 + pr_err("Failed to set VDDARM for %dkHz: %d\n",
105 107 freqs.new, ret);
106 108 goto err;
107 109 }
... ... @@ -110,7 +112,7 @@
110 112  
111 113 ret = clk_set_rate(armclk, freqs.new * 1000);
112 114 if (ret < 0) {
113   - pr_err("cpufreq: Failed to set rate %dkHz: %d\n",
  115 + pr_err("Failed to set rate %dkHz: %d\n",
114 116 freqs.new, ret);
115 117 goto err;
116 118 }
117 119  
... ... @@ -123,14 +125,14 @@
123 125 dvfs->vddarm_min,
124 126 dvfs->vddarm_max);
125 127 if (ret != 0) {
126   - pr_err("cpufreq: Failed to set VDDARM for %dkHz: %d\n",
  128 + pr_err("Failed to set VDDARM for %dkHz: %d\n",
127 129 freqs.new, ret);
128 130 goto err_clk;
129 131 }
130 132 }
131 133 #endif
132 134  
133   - pr_debug("cpufreq: Set actual frequency %lukHz\n",
  135 + pr_debug("Set actual frequency %lukHz\n",
134 136 clk_get_rate(armclk) / 1000);
135 137  
136 138 return 0;
... ... @@ -153,7 +155,7 @@
153 155  
154 156 count = regulator_count_voltages(vddarm);
155 157 if (count < 0) {
156   - pr_err("cpufreq: Unable to check supported voltages\n");
  158 + pr_err("Unable to check supported voltages\n");
157 159 }
158 160  
159 161 freq = s3c64xx_freq_table;
... ... @@ -171,7 +173,7 @@
171 173 }
172 174  
173 175 if (!found) {
174   - pr_debug("cpufreq: %dkHz unsupported by regulator\n",
  176 + pr_debug("%dkHz unsupported by regulator\n",
175 177 freq->frequency);
176 178 freq->frequency = CPUFREQ_ENTRY_INVALID;
177 179 }
178 180  
... ... @@ -194,13 +196,13 @@
194 196 return -EINVAL;
195 197  
196 198 if (s3c64xx_freq_table == NULL) {
197   - pr_err("cpufreq: No frequency information for this CPU\n");
  199 + pr_err("No frequency information for this CPU\n");
198 200 return -ENODEV;
199 201 }
200 202  
201 203 armclk = clk_get(NULL, "armclk");
202 204 if (IS_ERR(armclk)) {
203   - pr_err("cpufreq: Unable to obtain ARMCLK: %ld\n",
  205 + pr_err("Unable to obtain ARMCLK: %ld\n",
204 206 PTR_ERR(armclk));
205 207 return PTR_ERR(armclk);
206 208 }
207 209  
... ... @@ -209,12 +211,19 @@
209 211 vddarm = regulator_get(NULL, "vddarm");
210 212 if (IS_ERR(vddarm)) {
211 213 ret = PTR_ERR(vddarm);
212   - pr_err("cpufreq: Failed to obtain VDDARM: %d\n", ret);
213   - pr_err("cpufreq: Only frequency scaling available\n");
  214 + pr_err("Failed to obtain VDDARM: %d\n", ret);
  215 + pr_err("Only frequency scaling available\n");
214 216 vddarm = NULL;
215 217 } else {
216 218 s3c64xx_cpufreq_config_regulator();
217 219 }
  220 +
  221 + vddint = regulator_get(NULL, "vddint");
  222 + if (IS_ERR(vddint)) {
  223 + ret = PTR_ERR(vddint);
  224 + pr_err("Failed to obtain VDDINT: %d\n", ret);
  225 + vddint = NULL;
  226 + }
218 227 #endif
219 228  
220 229 freq = s3c64xx_freq_table;
... ... @@ -225,7 +234,7 @@
225 234 r = clk_round_rate(armclk, freq->frequency * 1000);
226 235 r /= 1000;
227 236 if (r != freq->frequency) {
228   - pr_debug("cpufreq: %dkHz unsupported by clock\n",
  237 + pr_debug("%dkHz unsupported by clock\n",
229 238 freq->frequency);
230 239 freq->frequency = CPUFREQ_ENTRY_INVALID;
231 240 }
... ... @@ -248,7 +257,7 @@
248 257  
249 258 ret = cpufreq_frequency_table_cpuinfo(policy, s3c64xx_freq_table);
250 259 if (ret != 0) {
251   - pr_err("cpufreq: Failed to configure frequency table: %d\n",
  260 + pr_err("Failed to configure frequency table: %d\n",
252 261 ret);
253 262 regulator_put(vddarm);
254 263 clk_put(armclk);