lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] smp: fix style issues in smp_twd.c

Browse Source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2009-05-17 10:58:54 +01:00
committed by Russell King
parent f32f4ce257
commit 4c5158d4c3
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/kernel/smp_twd.c
View File

@@ -48,7 +48,7 @@ static void twd_set_mode(enum clock_event_mode mode,
{ {
unsigned long ctrl; unsigned long ctrl;
switch(mode) { switch (mode) {
case CLOCK_EVT_MODE_PERIODIC: case CLOCK_EVT_MODE_PERIODIC:
/* timer load already set up */ /* timer load already set up */
ctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE ctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE
@@ -72,8 +72,10 @@ static int twd_set_next_event(unsigned long evt,
{ {
unsigned long ctrl = __raw_readl(twd_base + TWD_TIMER_CONTROL); unsigned long ctrl = __raw_readl(twd_base + TWD_TIMER_CONTROL);
ctrl |= TWD_TIMER_CONTROL_ENABLE;
__raw_writel(evt, twd_base + TWD_TIMER_COUNTER); __raw_writel(evt, twd_base + TWD_TIMER_COUNTER);
__raw_writel(ctrl | TWD_TIMER_CONTROL_ENABLE, twd_base + TWD_TIMER_CONTROL); __raw_writel(ctrl, twd_base + TWD_TIMER_CONTROL);
return 0; return 0;
} }
@@ -104,7 +106,7 @@ static void __cpuinit twd_calibrate_rate(void)
* the timer ticks * the timer ticks
*/ */
if (twd_timer_rate == 0) { if (twd_timer_rate == 0) {
printk("Calibrating local timer... "); printk(KERN_INFO "Calibrating local timer... ");
/* Wait for a tick to start */ /* Wait for a tick to start */
waitjiffies = get_jiffies_64() + 1; waitjiffies = get_jiffies_64() + 1;