From f70fc57e52fcd6c063eb378c0c370817cf00659e Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 22 Sep 2011 22:51:28 -0700 Subject: ARM: CSR: timer: do not initialise statics to 0 or NULL Signed-off-by: Barry Song --- arch/arm/mach-prima2/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-prima2') diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c index ed7ec48d11da..225ed3b8cee3 100644 --- a/arch/arm/mach-prima2/timer.c +++ b/arch/arm/mach-prima2/timer.c @@ -133,7 +133,7 @@ static struct irqaction sirfsoc_timer_irq = { /* Overwrite weak default sched_clock with more precise one */ unsigned long long notrace sched_clock(void) { - static int is_mapped = 0; + static int is_mapped; /* * sched_clock is called earlier than .init of sys_timer -- cgit v1.2.3 From c6b96c54130f34840bb482d8d2c851da74259c2a Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 22 Sep 2011 22:51:29 -0700 Subject: ARM: CSR: timer: space required before the open parenthesis '(' Signed-off-by: Barry Song --- arch/arm/mach-prima2/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-prima2') diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c index 225ed3b8cee3..26ab6fee5619 100644 --- a/arch/arm/mach-prima2/timer.c +++ b/arch/arm/mach-prima2/timer.c @@ -140,7 +140,7 @@ unsigned long long notrace sched_clock(void) * if we map timer memory in .init of sys_timer, system * will panic due to illegal memory access */ - if(!is_mapped) { + if (!is_mapped) { sirfsoc_of_timer_map(); is_mapped = 1; } -- cgit v1.2.3 From 013dd12f5a075d5b186512ae7b1712b4ed046ecd Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 22 Sep 2011 22:51:30 -0700 Subject: ARM: CSR: prima2: fix trailing whitespace Signed-off-by: Barry Song --- arch/arm/mach-prima2/prima2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-prima2') diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c index f57124bdd143..0ddf44698ec5 100644 --- a/arch/arm/mach-prima2/prima2.c +++ b/arch/arm/mach-prima2/prima2.c @@ -1,5 +1,5 @@ /* - * Defines machines for CSR SiRFprimaII + * Defines machines for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. * -- cgit v1.2.3 From 492c4a0df11573e141a2decc6012b3bddd14a11e Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 22 Sep 2011 22:51:31 -0700 Subject: ARM: CSR: clock: Fix indentation Signed-off-by: Barry Song --- arch/arm/mach-prima2/clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-prima2') diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c index 615a4e75ceab..aebad7e565cf 100644 --- a/arch/arm/mach-prima2/clock.c +++ b/arch/arm/mach-prima2/clock.c @@ -350,10 +350,10 @@ static struct clk_lookup onchip_clks[] = { .clk = &clk_mem, }, { .dev_id = "sys", - .clk = &clk_sys, + .clk = &clk_sys, }, { .dev_id = "io", - .clk = &clk_io, + .clk = &clk_io, }, }; -- cgit v1.2.3