Skip to contentSkip to conversation

ARM: CSR: cleanup some minor coding-style issues

PATCH New Barry Song 2 participants 6 messages Sep 23, 2011 – Sep 30, 2011

Subsystems (2)
lore
Share & tools
lore

Barry Song

author
#0 lore raw

cover ARM: CSR: cleanup some minor coding-style issues

Barry Song (4):
ARM: CSR: timer: do not initialise statics to 0 or NULL
ARM: CSR: timer: space required before the open parenthesis '('
ARM: CSR: prima2: fix trailing whitespace
ARM: CSR: clock: Fix indentation

 arch/arm/mach-prima2/clock.c  |    4 ++--
 arch/arm/mach-prima2/prima2.c |    2 +-
 arch/arm/mach-prima2/timer.c  |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog

author
#1 lore raw

PATCH 1/4 ARM: CSR: timer: do not initialise statics to 0 or NULL

---
 arch/arm/mach-prima2/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-prima2/timer.c +1 -1
index ed7ec48..225ed3b 100644
@@ -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
Signature · 6 lines
1.7.1



Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
author
#2 lore raw

PATCH 2/4 ARM: CSR: timer: space required before the open parenthesis '('

In reply to Barry Song
---
 arch/arm/mach-prima2/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-prima2/timer.c +1 -1
index 225ed3b..26ab6fe 100644
@@ -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;
 	}
Signature · 6 lines
1.7.1



Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
author
#3 lore raw

PATCH 3/4 ARM: CSR: prima2: fix trailing whitespace

In reply to Barry Song
---
 arch/arm/mach-prima2/prima2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-prima2/prima2.c +1 -1
index f57124b..0ddf446 100644
@@ -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.
  *
Signature · 6 lines
1.7.1



Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
author
#4 lore raw

PATCH 4/4 ARM: CSR: clock: Fix indentation

In reply to Barry Song
---
 arch/arm/mach-prima2/clock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-prima2/clock.c +2 -2
index 615a4e7..aebad7e 100644
@@ -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,
 	},
 };
 
Signature · 6 lines
1.7.1



Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
#5 lore raw

cover ARM: CSR: cleanup some minor coding-style issues

In reply to Barry Song
Quoted 10 lines · Barry Song

Barry Song (4):
ARM: CSR: timer: do not initialise statics to 0 or NULL
ARM: CSR: timer: space required before the open parenthesis '('
ARM: CSR: prima2: fix trailing whitespace
ARM: CSR: clock: Fix indentation

 arch/arm/mach-prima2/clock.c  |    4 ++--
 arch/arm/mach-prima2/prima2.c |    2 +-
 arch/arm/mach-prima2/timer.c  |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Hi Barry,

Sorry for the late reply. This series and the one before all look good to me, but I fear I'm losing track of the patches.

Can you send me pull requests for each set (fixes, cleanups, other changes) so I can be sure I get everything? If you have trouble with git.kernel.org still being down, I can apply the patches manually and let you double-check them, but that would be more work for both of us I think.

Arnd