summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-03-09 04:47:10 -0500
committerDaniel Lezcano <daniel.lezcano@linaro.org>2017-04-07 10:23:04 -0400
commitac9ce6d1a0cc29767932d9f2fcb8ebc97c5106c8 (patch)
treebd0e341ec2a98893b8d4c136cf03063425d7ba64
parent9a4914ce0dff47b53df9ffbf9f48120b86ccb4a3 (diff)
clocksource: Add missing line break to error messages
Printing with pr_* functions requires adding line break manually. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r--drivers/clocksource/arc_timer.c14
-rw-r--r--drivers/clocksource/arm_arch_timer.c2
-rw-r--r--drivers/clocksource/asm9260_timer.c2
-rw-r--r--drivers/clocksource/bcm2835_timer.c6
-rw-r--r--drivers/clocksource/bcm_kona_timer.c2
-rw-r--r--drivers/clocksource/clksrc-probe.c2
-rw-r--r--drivers/clocksource/dw_apb_timer.c2
-rw-r--r--drivers/clocksource/meson6_timer.c4
-rw-r--r--drivers/clocksource/mips-gic-timer.c2
-rw-r--r--drivers/clocksource/nomadik-mtu.c8
-rw-r--r--drivers/clocksource/pxa_timer.c6
-rw-r--r--drivers/clocksource/samsung_pwm_timer.c6
-rw-r--r--drivers/clocksource/sun4i_timer.c10
-rw-r--r--drivers/clocksource/tegra20_timer.c2
-rw-r--r--drivers/clocksource/time-armada-370-xp.c16
-rw-r--r--drivers/clocksource/time-efm32.c2
-rw-r--r--drivers/clocksource/time-orion.c4
-rw-r--r--drivers/clocksource/timer-atmel-pit.c2
-rw-r--r--drivers/clocksource/timer-digicolor.c6
-rw-r--r--drivers/clocksource/timer-integrator-ap.c4
-rw-r--r--drivers/clocksource/timer-nps.c6
-rw-r--r--drivers/clocksource/timer-prima2.c10
-rw-r--r--drivers/clocksource/timer-sp804.c4
-rw-r--r--drivers/clocksource/timer-sun5i.c6
-rw-r--r--drivers/clocksource/vf_pit_timer.c2
25 files changed, 65 insertions, 65 deletions
diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c
index 7517f959cba7..21649733827d 100644
--- a/drivers/clocksource/arc_timer.c
+++ b/drivers/clocksource/arc_timer.c
@@ -37,7 +37,7 @@ static int noinline arc_get_timer_clk(struct device_node *node)
37 37
38 clk = of_clk_get(node, 0); 38 clk = of_clk_get(node, 0);
39 if (IS_ERR(clk)) { 39 if (IS_ERR(clk)) {
40 pr_err("timer missing clk"); 40 pr_err("timer missing clk\n");
41 return PTR_ERR(clk); 41 return PTR_ERR(clk);
42 } 42 }
43 43
@@ -89,7 +89,7 @@ static int __init arc_cs_setup_gfrc(struct device_node *node)
89 89
90 READ_BCR(ARC_REG_MCIP_BCR, mp); 90 READ_BCR(ARC_REG_MCIP_BCR, mp);
91 if (!mp.gfrc) { 91 if (!mp.gfrc) {
92 pr_warn("Global-64-bit-Ctr clocksource not detected"); 92 pr_warn("Global-64-bit-Ctr clocksource not detected\n");
93 return -ENXIO; 93 return -ENXIO;
94 } 94 }
95 95
@@ -140,13 +140,13 @@ static int __init arc_cs_setup_rtc(struct device_node *node)
140 140
141 READ_BCR(ARC_REG_TIMERS_BCR, timer); 141 READ_BCR(ARC_REG_TIMERS_BCR, timer);
142 if (!timer.rtc) { 142 if (!timer.rtc) {
143 pr_warn("Local-64-bit-Ctr clocksource not detected"); 143 pr_warn("Local-64-bit-Ctr clocksource not detected\n");
144 return -ENXIO; 144 return -ENXIO;
145 } 145 }
146 146
147 /* Local to CPU hence not usable in SMP */ 147 /* Local to CPU hence not usable in SMP */
148 if (IS_ENABLED(CONFIG_SMP)) { 148 if (IS_ENABLED(CONFIG_SMP)) {
149 pr_warn("Local-64-bit-Ctr not usable in SMP"); 149 pr_warn("Local-64-bit-Ctr not usable in SMP\n");
150 return -EINVAL; 150 return -EINVAL;
151 } 151 }
152 152
@@ -290,13 +290,13 @@ static int __init arc_clockevent_setup(struct device_node *node)
290 290
291 arc_timer_irq = irq_of_parse_and_map(node, 0); 291 arc_timer_irq = irq_of_parse_and_map(node, 0);
292 if (arc_timer_irq <= 0) { 292 if (arc_timer_irq <= 0) {
293 pr_err("clockevent: missing irq"); 293 pr_err("clockevent: missing irq\n");
294 return -EINVAL; 294 return -EINVAL;
295 } 295 }
296 296
297 ret = arc_get_timer_clk(node); 297 ret = arc_get_timer_clk(node);
298 if (ret) { 298 if (ret) {
299 pr_err("clockevent: missing clk"); 299 pr_err("clockevent: missing clk\n");
300 return ret; 300 return ret;
301 } 301 }
302 302
@@ -313,7 +313,7 @@ static int __init arc_clockevent_setup(struct device_node *node)
313 arc_timer_starting_cpu, 313 arc_timer_starting_cpu,
314 arc_timer_dying_cpu); 314 arc_timer_dying_cpu);
315 if (ret) { 315 if (ret) {
316 pr_err("Failed to setup hotplug state"); 316 pr_err("Failed to setup hotplug state\n");
317 return ret; 317 return ret;
318 } 318 }
319 return 0; 319 return 0;
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 7a8a4117f123..56c3e25f4e1a 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -1055,7 +1055,7 @@ static int __init arch_timer_mem_init(struct device_node *np)
1055 1055
1056 ret = -EINVAL; 1056 ret = -EINVAL;
1057 if (!irq) { 1057 if (!irq) {
1058 pr_err("arch_timer: Frame missing %s irq", 1058 pr_err("arch_timer: Frame missing %s irq\n",
1059 arch_timer_mem_use_virtual ? "virt" : "phys"); 1059 arch_timer_mem_use_virtual ? "virt" : "phys");
1060 goto out; 1060 goto out;
1061 } 1061 }
diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c
index 1ba871b7fe11..c6780830b8ac 100644
--- a/drivers/clocksource/asm9260_timer.c
+++ b/drivers/clocksource/asm9260_timer.c
@@ -193,7 +193,7 @@ static int __init asm9260_timer_init(struct device_node *np)
193 193
194 priv.base = of_io_request_and_map(np, 0, np->name); 194 priv.base = of_io_request_and_map(np, 0, np->name);
195 if (IS_ERR(priv.base)) { 195 if (IS_ERR(priv.base)) {
196 pr_err("%s: unable to map resource", np->name); 196 pr_err("%s: unable to map resource\n", np->name);
197 return PTR_ERR(priv.base); 197 return PTR_ERR(priv.base);
198 } 198 }
199 199
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
index f2f29d2be1cf..dce44307469e 100644
--- a/drivers/clocksource/bcm2835_timer.c
+++ b/drivers/clocksource/bcm2835_timer.c
@@ -89,13 +89,13 @@ static int __init bcm2835_timer_init(struct device_node *node)
89 89
90 base = of_iomap(node, 0); 90 base = of_iomap(node, 0);
91 if (!base) { 91 if (!base) {
92 pr_err("Can't remap registers"); 92 pr_err("Can't remap registers\n");
93 return -ENXIO; 93 return -ENXIO;
94 } 94 }
95 95
96 ret = of_property_read_u32(node, "clock-frequency", &freq); 96 ret = of_property_read_u32(node, "clock-frequency", &freq);
97 if (ret) { 97 if (ret) {
98 pr_err("Can't read clock-frequency"); 98 pr_err("Can't read clock-frequency\n");
99 goto err_iounmap; 99 goto err_iounmap;
100 } 100 }
101 101
@@ -107,7 +107,7 @@ static int __init bcm2835_timer_init(struct device_node *node)
107 107
108 irq = irq_of_parse_and_map(node, DEFAULT_TIMER); 108 irq = irq_of_parse_and_map(node, DEFAULT_TIMER);
109 if (irq <= 0) { 109 if (irq <= 0) {
110 pr_err("Can't parse IRQ"); 110 pr_err("Can't parse IRQ\n");
111 ret = -EINVAL; 111 ret = -EINVAL;
112 goto err_iounmap; 112 goto err_iounmap;
113 } 113 }
diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
index 92f6e4deee74..fda5e1476638 100644
--- a/drivers/clocksource/bcm_kona_timer.c
+++ b/drivers/clocksource/bcm_kona_timer.c
@@ -179,7 +179,7 @@ static int __init kona_timer_init(struct device_node *node)
179 } else if (!of_property_read_u32(node, "clock-frequency", &freq)) { 179 } else if (!of_property_read_u32(node, "clock-frequency", &freq)) {
180 arch_timer_rate = freq; 180 arch_timer_rate = freq;
181 } else { 181 } else {
182 pr_err("Kona Timer v1 unable to determine clock-frequency"); 182 pr_err("Kona Timer v1 unable to determine clock-frequency\n");
183 return -EINVAL; 183 return -EINVAL;
184 } 184 }
185 185
diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c
index bc62be97f0a8..ac701ffb8d59 100644
--- a/drivers/clocksource/clksrc-probe.c
+++ b/drivers/clocksource/clksrc-probe.c
@@ -40,7 +40,7 @@ void __init clocksource_probe(void)
40 40
41 ret = init_func_ret(np); 41 ret = init_func_ret(np);
42 if (ret) { 42 if (ret) {
43 pr_err("Failed to initialize '%s': %d", 43 pr_err("Failed to initialize '%s': %d\n",
44 of_node_full_name(np), ret); 44 of_node_full_name(np), ret);
45 continue; 45 continue;
46 } 46 }
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index 63e4f5519577..9e937e23b63e 100644
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c
@@ -101,7 +101,7 @@ static irqreturn_t dw_apb_clockevent_irq(int irq, void *data)
101 struct dw_apb_clock_event_device *dw_ced = ced_to_dw_apb_ced(evt); 101 struct dw_apb_clock_event_device *dw_ced = ced_to_dw_apb_ced(evt);
102 102
103 if (!evt->event_handler) { 103 if (!evt->event_handler) {
104 pr_info("Spurious APBT timer interrupt %d", irq); 104 pr_info("Spurious APBT timer interrupt %d\n", irq);
105 return IRQ_NONE; 105 return IRQ_NONE;
106 } 106 }
107 107
diff --git a/drivers/clocksource/meson6_timer.c b/drivers/clocksource/meson6_timer.c
index 52af591a9fc7..39d21f693a33 100644
--- a/drivers/clocksource/meson6_timer.c
+++ b/drivers/clocksource/meson6_timer.c
@@ -133,13 +133,13 @@ static int __init meson6_timer_init(struct device_node *node)
133 133
134 timer_base = of_io_request_and_map(node, 0, "meson6-timer"); 134 timer_base = of_io_request_and_map(node, 0, "meson6-timer");
135 if (IS_ERR(timer_base)) { 135 if (IS_ERR(timer_base)) {
136 pr_err("Can't map registers"); 136 pr_err("Can't map registers\n");
137 return -ENXIO; 137 return -ENXIO;
138 } 138 }
139 139
140 irq = irq_of_parse_and_map(node, 0); 140 irq = irq_of_parse_and_map(node, 0);
141 if (irq <= 0) { 141 if (irq <= 0) {
142 pr_err("Can't parse IRQ"); 142 pr_err("Can't parse IRQ\n");
143 return -EINVAL; 143 return -EINVAL;
144 } 144 }
145 145
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index d9ef7a61e093..b6ad9c0a7c55 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -174,7 +174,7 @@ static int __init gic_clocksource_of_init(struct device_node *node)
174 174
175 if (!gic_present || !node->parent || 175 if (!gic_present || !node->parent ||
176 !of_device_is_compatible(node->parent, "mti,gic")) { 176 !of_device_is_compatible(node->parent, "mti,gic")) {
177 pr_warn("No DT definition for the mips gic driver"); 177 pr_warn("No DT definition for the mips gic driver\n");
178 return -ENXIO; 178 return -ENXIO;
179 } 179 }
180 180
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c
index 3c124d1ca600..7d44de304f37 100644
--- a/drivers/clocksource/nomadik-mtu.c
+++ b/drivers/clocksource/nomadik-mtu.c
@@ -260,25 +260,25 @@ static int __init nmdk_timer_of_init(struct device_node *node)
260 260
261 base = of_iomap(node, 0); 261 base = of_iomap(node, 0);
262 if (!base) { 262 if (!base) {
263 pr_err("Can't remap registers"); 263 pr_err("Can't remap registers\n");
264 return -ENXIO; 264 return -ENXIO;
265 } 265 }
266 266
267 pclk = of_clk_get_by_name(node, "apb_pclk"); 267 pclk = of_clk_get_by_name(node, "apb_pclk");
268 if (IS_ERR(pclk)) { 268 if (IS_ERR(pclk)) {
269 pr_err("could not get apb_pclk"); 269 pr_err("could not get apb_pclk\n");
270 return PTR_ERR(pclk); 270 return PTR_ERR(pclk);
271 } 271 }
272 272
273 clk = of_clk_get_by_name(node, "timclk"); 273 clk = of_clk_get_by_name(node, "timclk");
274 if (IS_ERR(clk)) { 274 if (IS_ERR(clk)) {
275 pr_err("could not get timclk"); 275 pr_err("could not get timclk\n");
276 return PTR_ERR(clk); 276 return PTR_ERR(clk);
277 } 277 }
278 278
279 irq = irq_of_parse_and_map(node, 0); 279 irq = irq_of_parse_and_map(node, 0);
280 if (irq <= 0) { 280 if (irq <= 0) {
281 pr_err("Can't parse IRQ"); 281 pr_err("Can't parse IRQ\n");
282 return -EINVAL; 282 return -EINVAL;
283 } 283 }
284 284
diff --git a/drivers/clocksource/pxa_timer.c b/drivers/clocksource/pxa_timer.c
index 1c24de215c14..a10fa667325f 100644
--- a/drivers/clocksource/pxa_timer.c
+++ b/drivers/clocksource/pxa_timer.c
@@ -166,14 +166,14 @@ static int __init pxa_timer_common_init(int irq, unsigned long clock_tick_rate)
166 166
167 ret = setup_irq(irq, &pxa_ost0_irq); 167 ret = setup_irq(irq, &pxa_ost0_irq);
168 if (ret) { 168 if (ret) {
169 pr_err("Failed to setup irq"); 169 pr_err("Failed to setup irq\n");
170 return ret; 170 return ret;
171 } 171 }
172 172
173 ret = clocksource_mmio_init(timer_base + OSCR, "oscr0", clock_tick_rate, 200, 173 ret = clocksource_mmio_init(timer_base + OSCR, "oscr0", clock_tick_rate, 200,
174 32, clocksource_mmio_readl_up); 174 32, clocksource_mmio_readl_up);
175 if (ret) { 175 if (ret) {
176 pr_err("Failed to init clocksource"); 176 pr_err("Failed to init clocksource\n");
177 return ret; 177 return ret;
178 } 178 }
179 179
@@ -203,7 +203,7 @@ static int __init pxa_timer_dt_init(struct device_node *np)
203 203
204 ret = clk_prepare_enable(clk); 204 ret = clk_prepare_enable(clk);
205 if (ret) { 205 if (ret) {
206 pr_crit("Failed to prepare clock"); 206 pr_crit("Failed to prepare clock\n");
207 return ret; 207 return ret;
208 } 208 }
209 209
diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c
index 0093ece661fe..a68e6538c809 100644
--- a/drivers/clocksource/samsung_pwm_timer.c
+++ b/drivers/clocksource/samsung_pwm_timer.c
@@ -385,7 +385,7 @@ static int __init _samsung_pwm_clocksource_init(void)
385 mask = ~pwm.variant.output_mask & ((1 << SAMSUNG_PWM_NUM) - 1); 385 mask = ~pwm.variant.output_mask & ((1 << SAMSUNG_PWM_NUM) - 1);
386 channel = fls(mask) - 1; 386 channel = fls(mask) - 1;
387 if (channel < 0) { 387 if (channel < 0) {
388 pr_crit("failed to find PWM channel for clocksource"); 388 pr_crit("failed to find PWM channel for clocksource\n");
389 return -EINVAL; 389 return -EINVAL;
390 } 390 }
391 pwm.source_id = channel; 391 pwm.source_id = channel;
@@ -393,7 +393,7 @@ static int __init _samsung_pwm_clocksource_init(void)
393 mask &= ~(1 << channel); 393 mask &= ~(1 << channel);
394 channel = fls(mask) - 1; 394 channel = fls(mask) - 1;
395 if (channel < 0) { 395 if (channel < 0) {
396 pr_crit("failed to find PWM channel for clock event"); 396 pr_crit("failed to find PWM channel for clock event\n");
397 return -EINVAL; 397 return -EINVAL;
398 } 398 }
399 pwm.event_id = channel; 399 pwm.event_id = channel;
@@ -448,7 +448,7 @@ static int __init samsung_pwm_alloc(struct device_node *np,
448 448
449 pwm.timerclk = of_clk_get_by_name(np, "timers"); 449 pwm.timerclk = of_clk_get_by_name(np, "timers");
450 if (IS_ERR(pwm.timerclk)) { 450 if (IS_ERR(pwm.timerclk)) {
451 pr_crit("failed to get timers clock for timer"); 451 pr_crit("failed to get timers clock for timer\n");
452 return PTR_ERR(pwm.timerclk); 452 return PTR_ERR(pwm.timerclk);
453 } 453 }
454 454
diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index c83452cacb41..4452d5c8f304 100644
--- a/drivers/clocksource/sun4i_timer.c
+++ b/drivers/clocksource/sun4i_timer.c
@@ -159,25 +159,25 @@ static int __init sun4i_timer_init(struct device_node *node)
159 159
160 timer_base = of_iomap(node, 0); 160 timer_base = of_iomap(node, 0);
161 if (!timer_base) { 161 if (!timer_base) {
162 pr_crit("Can't map registers"); 162 pr_crit("Can't map registers\n");
163 return -ENXIO; 163 return -ENXIO;
164 } 164 }
165 165
166 irq = irq_of_parse_and_map(node, 0); 166 irq = irq_of_parse_and_map(node, 0);
167 if (irq <= 0) { 167 if (irq <= 0) {
168 pr_crit("Can't parse IRQ"); 168 pr_crit("Can't parse IRQ\n");
169 return -EINVAL; 169 return -EINVAL;
170 } 170 }
171 171
172 clk = of_clk_get(node, 0); 172 clk = of_clk_get(node, 0);
173 if (IS_ERR(clk)) { 173 if (IS_ERR(clk)) {
174 pr_crit("Can't get timer clock"); 174 pr_crit("Can't get timer clock\n");
175 return PTR_ERR(clk); 175 return PTR_ERR(clk);
176 } 176 }
177 177
178 ret = clk_prepare_enable(clk); 178 ret = clk_prepare_enable(clk);
179 if (ret) { 179 if (ret) {
180 pr_err("Failed to prepare clock"); 180 pr_err("Failed to prepare clock\n");
181 return ret; 181 return ret;
182 } 182 }
183 183
@@ -200,7 +200,7 @@ static int __init sun4i_timer_init(struct device_node *node)
200 ret = clocksource_mmio_init(timer_base + TIMER_CNTVAL_REG(1), node->name, 200 ret = clocksource_mmio_init(timer_base + TIMER_CNTVAL_REG(1), node->name,
201 rate, 350, 32, clocksource_mmio_readl_down); 201 rate, 350, 32, clocksource_mmio_readl_down);
202 if (ret) { 202 if (ret) {
203 pr_err("Failed to register clocksource"); 203 pr_err("Failed to register clocksource\n");
204 return ret; 204 return ret;
205 } 205 }
206 206
diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c
index f960891aa04e..b9990b9c98c5 100644
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@ -245,7 +245,7 @@ static int __init tegra20_init_rtc(struct device_node *np)
245 245
246 rtc_base = of_iomap(np, 0); 246 rtc_base = of_iomap(np, 0);
247 if (!rtc_base) { 247 if (!rtc_base) {
248 pr_err("Can't map RTC registers"); 248 pr_err("Can't map RTC registers\n");
249 return -ENXIO; 249 return -ENXIO;
250 } 250 }
251 251
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 4440aefc59cd..aea4380129ea 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -247,13 +247,13 @@ static int __init armada_370_xp_timer_common_init(struct device_node *np)
247 247
248 timer_base = of_iomap(np, 0); 248 timer_base = of_iomap(np, 0);
249 if (!timer_base) { 249 if (!timer_base) {
250 pr_err("Failed to iomap"); 250 pr_err("Failed to iomap\n");
251 return -ENXIO; 251 return -ENXIO;
252 } 252 }
253 253
254 local_base = of_iomap(np, 1); 254 local_base = of_iomap(np, 1);
255 if (!local_base) { 255 if (!local_base) {
256 pr_err("Failed to iomap"); 256 pr_err("Failed to iomap\n");
257 return -ENXIO; 257 return -ENXIO;
258 } 258 }
259 259
@@ -298,7 +298,7 @@ static int __init armada_370_xp_timer_common_init(struct device_node *np)
298 "armada_370_xp_clocksource", 298 "armada_370_xp_clocksource",
299 timer_clk, 300, 32, clocksource_mmio_readl_down); 299 timer_clk, 300, 32, clocksource_mmio_readl_down);
300 if (res) { 300 if (res) {
301 pr_err("Failed to initialize clocksource mmio"); 301 pr_err("Failed to initialize clocksource mmio\n");
302 return res; 302 return res;
303 } 303 }
304 304
@@ -315,7 +315,7 @@ static int __init armada_370_xp_timer_common_init(struct device_node *np)
315 armada_370_xp_evt); 315 armada_370_xp_evt);
316 /* Immediately configure the timer on the boot CPU */ 316 /* Immediately configure the timer on the boot CPU */
317 if (res) { 317 if (res) {
318 pr_err("Failed to request percpu irq"); 318 pr_err("Failed to request percpu irq\n");
319 return res; 319 return res;
320 } 320 }
321 321
@@ -324,7 +324,7 @@ static int __init armada_370_xp_timer_common_init(struct device_node *np)
324 armada_370_xp_timer_starting_cpu, 324 armada_370_xp_timer_starting_cpu,
325 armada_370_xp_timer_dying_cpu); 325 armada_370_xp_timer_dying_cpu);
326 if (res) { 326 if (res) {
327 pr_err("Failed to setup hotplug state and timer"); 327 pr_err("Failed to setup hotplug state and timer\n");
328 return res; 328 return res;
329 } 329 }
330 330
@@ -339,7 +339,7 @@ static int __init armada_xp_timer_init(struct device_node *np)
339 int ret; 339 int ret;
340 340
341 if (IS_ERR(clk)) { 341 if (IS_ERR(clk)) {
342 pr_err("Failed to get clock"); 342 pr_err("Failed to get clock\n");
343 return PTR_ERR(clk); 343 return PTR_ERR(clk);
344 } 344 }
345 345
@@ -375,7 +375,7 @@ static int __init armada_375_timer_init(struct device_node *np)
375 375
376 /* Must have at least a clock */ 376 /* Must have at least a clock */
377 if (IS_ERR(clk)) { 377 if (IS_ERR(clk)) {
378 pr_err("Failed to get clock"); 378 pr_err("Failed to get clock\n");
379 return PTR_ERR(clk); 379 return PTR_ERR(clk);
380 } 380 }
381 381
@@ -399,7 +399,7 @@ static int __init armada_370_timer_init(struct device_node *np)
399 399
400 clk = of_clk_get(np, 0); 400 clk = of_clk_get(np, 0);
401 if (IS_ERR(clk)) { 401 if (IS_ERR(clk)) {
402 pr_err("Failed to get clock"); 402 pr_err("Failed to get clock\n");
403 return PTR_ERR(clk); 403 return PTR_ERR(clk);
404 } 404 }
405 405
diff --git a/drivers/clocksource/time-efm32.c b/drivers/clocksource/time-efm32.c
index 5ac344b383e1..ce0f97b4e5db 100644
--- a/drivers/clocksource/time-efm32.c
+++ b/drivers/clocksource/time-efm32.c
@@ -235,7 +235,7 @@ static int __init efm32_clockevent_init(struct device_node *np)
235 235
236 ret = setup_irq(irq, &efm32_clock_event_irq); 236 ret = setup_irq(irq, &efm32_clock_event_irq);
237 if (ret) { 237 if (ret) {
238 pr_err("Failed setup irq"); 238 pr_err("Failed setup irq\n");
239 goto err_setup_irq; 239 goto err_setup_irq;
240 } 240 }
241 241
diff --git a/drivers/clocksource/time-orion.c b/drivers/clocksource/time-orion.c
index 7eb2ab0bd114..b9b97f630c4d 100644
--- a/drivers/clocksource/time-orion.c
+++ b/drivers/clocksource/time-orion.c
@@ -141,7 +141,7 @@ static int __init orion_timer_init(struct device_node *np)
141 141
142 ret = clk_prepare_enable(clk); 142 ret = clk_prepare_enable(clk);
143 if (ret) { 143 if (ret) {
144 pr_err("Failed to prepare clock"); 144 pr_err("Failed to prepare clock\n");
145 return ret; 145 return ret;
146 } 146 }
147 147
@@ -165,7 +165,7 @@ static int __init orion_timer_init(struct device_node *np)
165 "orion_clocksource", rate, 300, 32, 165 "orion_clocksource", rate, 300, 32,
166 clocksource_mmio_readl_down); 166 clocksource_mmio_readl_down);
167 if (ret) { 167 if (ret) {
168 pr_err("Failed to initialize mmio timer"); 168 pr_err("Failed to initialize mmio timer\n");
169 return ret; 169 return ret;
170 } 170 }
171 171
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
index c0b5df3167a0..cc112351dc70 100644
--- a/drivers/clocksource/timer-atmel-pit.c
+++ b/drivers/clocksource/timer-atmel-pit.c
@@ -226,7 +226,7 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
226 226
227 ret = clocksource_register_hz(&data->clksrc, pit_rate); 227 ret = clocksource_register_hz(&data->clksrc, pit_rate);
228 if (ret) { 228 if (ret) {
229 pr_err("Failed to register clocksource"); 229 pr_err("Failed to register clocksource\n");
230 return ret; 230 return ret;
231 } 231 }
232 232
diff --git a/drivers/clocksource/timer-digicolor.c b/drivers/clocksource/timer-digicolor.c
index e9f50d289362..94a161eb9cce 100644
--- a/drivers/clocksource/timer-digicolor.c
+++ b/drivers/clocksource/timer-digicolor.c
@@ -161,19 +161,19 @@ static int __init digicolor_timer_init(struct device_node *node)
161 */ 161 */
162 dc_timer_dev.base = of_iomap(node, 0); 162 dc_timer_dev.base = of_iomap(node, 0);
163 if (!dc_timer_dev.base) { 163 if (!dc_timer_dev.base) {
164 pr_err("Can't map registers"); 164 pr_err("Can't map registers\n");
165 return -ENXIO; 165 return -ENXIO;
166 } 166 }
167 167
168 irq = irq_of_parse_and_map(node, dc_timer_dev.timer_id); 168 irq = irq_of_parse_and_map(node, dc_timer_dev.timer_id);
169 if (irq <= 0) { 169 if (irq <= 0) {
170 pr_err("Can't parse IRQ"); 170 pr_err("Can't parse IRQ\n");
171 return -EINVAL; 171 return -EINVAL;
172 } 172 }
173 173
174 clk = of_clk_get(node, 0); 174 clk = of_clk_get(node, 0);
175 if (IS_ERR(clk)) { 175 if (IS_ERR(clk)) {
176 pr_err("Can't get timer clock"); 176 pr_err("Can't get timer clock\n");
177 return PTR_ERR(clk); 177 return PTR_ERR(clk);
178 } 178 }
179 clk_prepare_enable(clk); 179 clk_prepare_enable(clk);
diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
index df6e672afc04..04ad3066e190 100644
--- a/drivers/clocksource/timer-integrator-ap.c
+++ b/drivers/clocksource/timer-integrator-ap.c
@@ -200,7 +200,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
200 err = of_property_read_string(of_aliases, 200 err = of_property_read_string(of_aliases,
201 "arm,timer-primary", &path); 201 "arm,timer-primary", &path);
202 if (err) { 202 if (err) {
203 pr_warn("Failed to read property"); 203 pr_warn("Failed to read property\n");
204 return err; 204 return err;
205 } 205 }
206 206
@@ -209,7 +209,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
209 err = of_property_read_string(of_aliases, 209 err = of_property_read_string(of_aliases,
210 "arm,timer-secondary", &path); 210 "arm,timer-secondary", &path);
211 if (err) { 211 if (err) {
212 pr_warn("Failed to read property"); 212 pr_warn("Failed to read property\n");
213 return err; 213 return err;
214 } 214 }
215 215
diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c
index da1f7986e477..e74ea1722ad3 100644
--- a/drivers/clocksource/timer-nps.c
+++ b/drivers/clocksource/timer-nps.c
@@ -55,7 +55,7 @@ static int __init nps_get_timer_clk(struct device_node *node,
55 *clk = of_clk_get(node, 0); 55 *clk = of_clk_get(node, 0);
56 ret = PTR_ERR_OR_ZERO(*clk); 56 ret = PTR_ERR_OR_ZERO(*clk);
57 if (ret) { 57 if (ret) {
58 pr_err("timer missing clk"); 58 pr_err("timer missing clk\n");
59 return ret; 59 return ret;
60 } 60 }
61 61
@@ -247,7 +247,7 @@ static int __init nps_setup_clockevent(struct device_node *node)
247 247
248 nps_timer0_irq = irq_of_parse_and_map(node, 0); 248 nps_timer0_irq = irq_of_parse_and_map(node, 0);
249 if (nps_timer0_irq <= 0) { 249 if (nps_timer0_irq <= 0) {
250 pr_err("clockevent: missing irq"); 250 pr_err("clockevent: missing irq\n");
251 return -EINVAL; 251 return -EINVAL;
252 } 252 }
253 253
@@ -270,7 +270,7 @@ static int __init nps_setup_clockevent(struct device_node *node)
270 nps_timer_starting_cpu, 270 nps_timer_starting_cpu,
271 nps_timer_dying_cpu); 271 nps_timer_dying_cpu);
272 if (ret) { 272 if (ret) {
273 pr_err("Failed to setup hotplug state"); 273 pr_err("Failed to setup hotplug state\n");
274 clk_disable_unprepare(clk); 274 clk_disable_unprepare(clk);
275 free_percpu_irq(nps_timer0_irq, &nps_clockevent_device); 275 free_percpu_irq(nps_timer0_irq, &nps_clockevent_device);
276 return ret; 276 return ret;
diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c
index bfa981ac1eaf..b4122ed1accb 100644
--- a/drivers/clocksource/timer-prima2.c
+++ b/drivers/clocksource/timer-prima2.c
@@ -196,20 +196,20 @@ static int __init sirfsoc_prima2_timer_init(struct device_node *np)
196 196
197 clk = of_clk_get(np, 0); 197 clk = of_clk_get(np, 0);
198 if (IS_ERR(clk)) { 198 if (IS_ERR(clk)) {
199 pr_err("Failed to get clock"); 199 pr_err("Failed to get clock\n");
200 return PTR_ERR(clk); 200 return PTR_ERR(clk);
201 } 201 }
202 202
203 ret = clk_prepare_enable(clk); 203 ret = clk_prepare_enable(clk);
204 if (ret) { 204 if (ret) {
205 pr_err("Failed to enable clock"); 205 pr_err("Failed to enable clock\n");
206 return ret; 206 return ret;
207 } 207 }
208 208
209 rate = clk_get_rate(clk); 209 rate = clk_get_rate(clk);
210 210
211 if (rate < PRIMA2_CLOCK_FREQ || rate % PRIMA2_CLOCK_FREQ) { 211 if (rate < PRIMA2_CLOCK_FREQ || rate % PRIMA2_CLOCK_FREQ) {
212 pr_err("Invalid clock rate"); 212 pr_err("Invalid clock rate\n");
213 return -EINVAL; 213 return -EINVAL;
214 } 214 }
215 215
@@ -229,7 +229,7 @@ static int __init sirfsoc_prima2_timer_init(struct device_node *np)
229 229
230 ret = clocksource_register_hz(&sirfsoc_clocksource, PRIMA2_CLOCK_FREQ); 230 ret = clocksource_register_hz(&sirfsoc_clocksource, PRIMA2_CLOCK_FREQ);
231 if (ret) { 231 if (ret) {
232 pr_err("Failed to register clocksource"); 232 pr_err("Failed to register clocksource\n");
233 return ret; 233 return ret;
234 } 234 }
235 235
@@ -237,7 +237,7 @@ static int __init sirfsoc_prima2_timer_init(struct device_node *np)
237 237
238 ret = setup_irq(sirfsoc_timer_irq.irq, &sirfsoc_timer_irq); 238 ret = setup_irq(sirfsoc_timer_irq.irq, &sirfsoc_timer_irq);
239 if (ret) { 239 if (ret) {
240 pr_err("Failed to setup irq"); 240 pr_err("Failed to setup irq\n");
241 return ret; 241 return ret;
242 } 242 }
243 243
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
index d07863388e05..2d575a8c0939 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -299,13 +299,13 @@ static int __init integrator_cp_of_init(struct device_node *np)
299 299
300 base = of_iomap(np, 0); 300 base = of_iomap(np, 0);
301 if (!base) { 301 if (!base) {
302 pr_err("Failed to iomap"); 302 pr_err("Failed to iomap\n");
303 return -ENXIO; 303 return -ENXIO;
304 } 304 }
305 305
306 clk = of_clk_get(np, 0); 306 clk = of_clk_get(np, 0);
307 if (IS_ERR(clk)) { 307 if (IS_ERR(clk)) {
308 pr_err("Failed to get clock"); 308 pr_err("Failed to get clock\n");
309 return PTR_ERR(clk); 309 return PTR_ERR(clk);
310 } 310 }
311 311
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index a3e662b15964..2e9c830ae1cd 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -332,19 +332,19 @@ static int __init sun5i_timer_init(struct device_node *node)
332 332
333 timer_base = of_io_request_and_map(node, 0, of_node_full_name(node)); 333 timer_base = of_io_request_and_map(node, 0, of_node_full_name(node));
334 if (IS_ERR(timer_base)) { 334 if (IS_ERR(timer_base)) {
335 pr_err("Can't map registers"); 335 pr_err("Can't map registers\n");
336 return PTR_ERR(timer_base);; 336 return PTR_ERR(timer_base);;
337 } 337 }
338 338
339 irq = irq_of_parse_and_map(node, 0); 339 irq = irq_of_parse_and_map(node, 0);
340 if (irq <= 0) { 340 if (irq <= 0) {
341 pr_err("Can't parse IRQ"); 341 pr_err("Can't parse IRQ\n");
342 return -EINVAL; 342 return -EINVAL;
343 } 343 }
344 344
345 clk = of_clk_get(node, 0); 345 clk = of_clk_get(node, 0);
346 if (IS_ERR(clk)) { 346 if (IS_ERR(clk)) {
347 pr_err("Can't get timer clock"); 347 pr_err("Can't get timer clock\n");
348 return PTR_ERR(clk); 348 return PTR_ERR(clk);
349 } 349 }
350 350
diff --git a/drivers/clocksource/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c
index 55d8d8402d90..e0849e20a307 100644
--- a/drivers/clocksource/vf_pit_timer.c
+++ b/drivers/clocksource/vf_pit_timer.c
@@ -165,7 +165,7 @@ static int __init pit_timer_init(struct device_node *np)
165 165
166 timer_base = of_iomap(np, 0); 166 timer_base = of_iomap(np, 0);
167 if (!timer_base) { 167 if (!timer_base) {
168 pr_err("Failed to iomap"); 168 pr_err("Failed to iomap\n");
169 return -ENXIO; 169 return -ENXIO;
170 } 170 }
171 171