led: remove camelcase in LED functions from assembly

PATCH New Jason Kridner 4 participants 8 messages Sep 11, 2011 – Sep 12, 2011

Subsystems (2)

Arm (32-bit) Arm/actions semi architecture

lore

Share & tools

lore

Jason Kridner

author

2011-09-11 22:22 UTC #0 lore raw

PATCH 1/1 led: remove camelcase in LED functions from assembly

This was done with the following command-line:

Signed-off-by Jason Kridner <[email protected]>

---
 arch/arm/cpu/arm1176/start.S                |    2 +-
 arch/arm/cpu/arm720t/start.S                |    2 +-
 arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S |   10 +++++-----
 arch/arm/cpu/arm920t/start.S                |    2 +-
 arch/arm/cpu/arm925t/start.S                |    2 +-
 arch/arm/cpu/arm926ejs/start.S              |    2 +-
 arch/arm/cpu/arm_intcm/start.S              |    2 +-
 arch/arm/cpu/ixp/start.S                    |    2 +-
 arch/arm/cpu/s3c44b0/start.S                |    2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

arch/arm/cpu/arm1176/start.S +1 -1

index 0aa613d..848144a 100644
@@ -358,7 +358,7 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 
 #ifndef CONFIG_NAND_SPL
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
 #endif
 #endif

arch/arm/cpu/arm720t/start.S +1 -1

index 00fa8c9..540e3c2 100644
@@ -234,7 +234,7 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 	bne	clbss_l
 
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
 #endif
 
 /*

arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S +5 -5

index a20ec89..f21e237 100644
@@ -34,8 +34,8 @@ lowlevel_init:
 	str lr, [r1]
 
 	/* Turn on both LEDs */
-	bl red_LED_on
-	bl green_LED_on
+	bl red_led_on
+	bl green_led_on
 
 	/* Configure flash wait states before we switch to the PLL */
 	bl flash_cfg

@@ -44,14 +44,14 @@ lowlevel_init:
 	bl pll_cfg
 
 	/* Turn off the Green LED and leave the Red LED on */
-	bl green_LED_off
+	bl green_led_off
 
 	/* Setup SDRAM */
 	bl sdram_cfg
 
 	/* Turn on Green LED, Turn off the Red LED */
-	bl green_LED_on
-	bl red_LED_off
+	bl green_led_on
+	bl red_led_off
 
 	/* FIXME: we use async mode for now */
 	mrc p15, 0, r0, c1, c0, 0

arch/arm/cpu/arm920t/start.S +1 -1

index c308420..8c5612c 100644
@@ -277,7 +277,7 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 	bne	clbss_l
 
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
 #endif
 
 /*

arch/arm/cpu/arm925t/start.S +1 -1

index 17cf5dc..dbb93ef 100644
@@ -271,7 +271,7 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 	bne	clbss_l
 
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
 #endif
 
 /*

arch/arm/cpu/arm926ejs/start.S +1 -1

index 16e35c2..d164d6d 100644
@@ -270,7 +270,7 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 	bne	clbss_l
 
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
 #endif
 
 /*

arch/arm/cpu/arm_intcm/start.S +1 -1

index ba96208..2033b36 100644
@@ -238,7 +238,7 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 	bne	clbss_l
 
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
 #endif
 
 /*

arch/arm/cpu/ixp/start.S +1 -1

index b17d267..cb32121 100644
@@ -340,7 +340,7 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 	bne	clbss_l
 
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
 #endif
 
 /*

arch/arm/cpu/s3c44b0/start.S +1 -1

index 2545cf6..a29d5b4 100644
@@ -223,7 +223,7 @@ clbss_l:str	r2, [r0]		/* clear loop...		    */
 	bne	clbss_l
 
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
 #endif
 
 /*

Signature · 1 line

1.7.4.1

Mike Frysinger

2011-09-12 04:04 UTC #1 lore raw

PATCH 1/1 led: remove camelcase in LED functions from assembly

Quoted 5 lines · On Sunday, September 11, 2011 18:22:26 Jason Kridner wrote:

This was done with the following command-line:
for file in find . | grep '\.[chS]$';
do perl -i -pe 's/(green|yellow|red|blue)_LED_(on|off)/$1_led_$2/g' $file;
done

one line:

find . -name '*.[chS]' -exec \
	sed -ri 's/(green|yellow|red|blue)_LED_(on|off)/\1_led_\2/g'

arch/arm/cpu/arm1176/start.S clbss_l:str r2, [r0] /* clear loop... */ · line 361

Quoted 6 lines

arch/arm/cpu/arm1176/start.S +1 -1
 
 	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on

seems like you didnt fix coloured_LED_init

also, i dont see you changing any of the .c files where these funcs are actually defined
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110912/4d1246d3/attachment.pgp

Albert ARIBAUD

2011-09-12 05:31 UTC #2 lore raw

PATCH 1/1 led: remove camelcase in LED functions from assembly

Hi Mike,

Le 12/09/2011 06:04, Mike Frysinger a ?crit :

Quoted 20 lines · On Sunday, September 11, 2011 18:22:26 Jason Kridner wrote:

Quoted 5 lines
This was done with the following command-line:
for file in find . | grep '\.[chS]$';
do perl -i -pe 's/(green|yellow|red|blue)_LED_(on|off)/$1_led_$2/g' $file;
done
one line:
find . -name '*.[chS]' -exec \
	sed -ri 's/(green|yellow|red|blue)_LED_(on|off)/\1_led_\2/g'
arch/arm/cpu/arm1176/start.S clbss_l:str r2, [r0] /* clear loop... */ · line 361
Quoted 6 lines
arch/arm/cpu/arm1176/start.S +1 -1
 
  	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
seems like you didnt fix coloured_LED_init

Quoted 3 lines

also, i dont see you changing any of the .c files where these funcs are actually defined
-mike

This patch is assumed to apply above the current git tip, where the function definitions were already changed, and only .S files should be fixed.

Running MAKEALL arm right now, just to make sure, then I will apply it on top of u-boot-arm/master.

Amicalement,

Signature · 1 line

Albert.

Albert ARIBAUD

2011-09-12 15:40 UTC #3 lore raw

PATCH 1/1 led: remove camelcase in LED functions from assembly

Le 12/09/2011 07:31, Albert ARIBAUD a ?crit :

Quoted 27 lines

Hi Mike,
Le 12/09/2011 06:04, Mike Frysinger a ?crit :
Quoted 20 lines · On Sunday, September 11, 2011 18:22:26 Jason Kridner wrote:
Quoted 5 lines
This was done with the following command-line:
for file in `find . | grep '\.[chS]$'`;
   do perl -i -pe 's/(green|yellow|red|blue)_LED_(on|off)/$1_led_$2/g' $file;
done
one line:
find . -name '*.[chS]' -exec \
	sed -ri 's/(green|yellow|red|blue)_LED_(on|off)/\1_led_\2/g'
arch/arm/cpu/arm1176/start.S clbss_l:str r2, [r0] /* clear loop... */ · line 361
Quoted 6 lines
arch/arm/cpu/arm1176/start.S +1 -1
 
   	bl coloured_LED_init
-	bl red_LED_on
+	bl red_led_on
seems like you didnt fix coloured_LED_init
Quoted 3 lines
also, i dont see you changing any of the .c files where these funcs are actually defined
-mike

Quoted 6 lines

This patch is assumed to apply above the current git tip, where the function definitions were already changed, and only .S files should be fixed.
Running MAKEALL arm right now, just to make sure, then I will apply it on top of u-boot-arm/master.

Applied to u-boot-arm/master, thanks -- and the non-clean ARM boards count is down to 29 out of 242.

Amicalement,

Signature · 1 line

Albert.

Mike Frysinger

2011-09-12 16:27 UTC #4 lore raw

PATCH 1/1 led: remove camelcase in LED functions from assembly

In reply to Albert ARIBAUD

Quoted 26 lines · On Monday, September 12, 2011 01:31:45 Albert ARIBAUD wrote:

Le 12/09/2011 06:04, Mike Frysinger a ?crit :
Quoted 25 lines · On Sunday, September 11, 2011 18:22:26 Jason Kridner wrote:
Quoted 8 lines
This was done with the following command-line:
for file in find . | grep '\.[chS]$';
do perl -i -pe 's/(green|yellow|red|blue)_LED_(on|off)/$1_led_$2/g' $file;
done
one line:
find . -name '*.[chS]' -exec \
	sed -ri 's/(green|yellow|red|blue)_LED_(on|off)/\1_led_\2/g'
arch/arm/cpu/arm1176/start.S clbss_l:str r2, [r0] /* clear loop... */
Quoted 7 lines
arch/arm/cpu/arm1176/start.S +1 -1
 
  	bl coloured_LED_init
 
-	bl red_LED_on
+	bl red_led_on
seems like you didnt fix coloured_LED_init

Quoted 6 lines

Quoted 2 lines
also, i dont see you changing any of the .c files where these funcs are actually defined
This patch is assumed to apply above the current git tip, where the function definitions were already changed, and only .S files should be fixed.

by "current git tip" i'm guessing you mean "current arm master". i was looking at the mainline u-boot master and the C files weren't changed.

Quoted 2 lines

Running MAKEALL arm right now, just to make sure, then I will apply it on top of u-boot-arm/master.

be nice to send out a single squashed patch to wolfgang rather than a few known-to-be-broken ones ...
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110912/b64a0921/attachment.pgp

Albert ARIBAUD

2011-09-12 19:32 UTC #5 lore raw

PATCH 1/1 led: remove camelcase in LED functions from assembly

Le 12/09/2011 18:27, Mike Frysinger a ?crit :

Quoted 37 lines · On Monday, September 12, 2011 01:31:45 Albert ARIBAUD wrote:

Quoted 26 lines
Le 12/09/2011 06:04, Mike Frysinger a ?crit :
Quoted 25 lines · On Sunday, September 11, 2011 18:22:26 Jason Kridner wrote:
Quoted 8 lines
This was done with the following command-line:
for file in find . | grep '\.[chS]$';
   do perl -i -pe 's/(green|yellow|red|blue)_LED_(on|off)/$1_led_$2/g'
   $file;
done
one line:
find . -name '*.[chS]' -exec \
	sed -ri 's/(green|yellow|red|blue)_LED_(on|off)/\1_led_\2/g'
arch/arm/cpu/arm1176/start.S clbss_l:str r2, [r0] /* clear loop... */
Quoted 7 lines
arch/arm/cpu/arm1176/start.S +1 -1
 
   	bl coloured_LED_init
 
-	bl red_LED_on
+	bl red_led_on
seems like you didnt fix coloured_LED_init
Quoted 6 lines
Quoted 2 lines
also, i dont see you changing any of the .c files where these funcs are actually defined
This patch is assumed to apply above the current git tip, where the function definitions were already changed, and only .S files should be fixed.
by "current git tip" i'm guessing you mean "current arm master". i was looking at the mainline u-boot master and the C files weren't changed.

Quoted 6 lines

Quoted 2 lines
Running MAKEALL arm right now, just to make sure, then I will apply it on top of u-boot-arm/master.
be nice to send out a single squashed patch to wolfgang rather than a few known-to-be-broken ones ...
-mike

As a rule, I'd rather not alter the commits I did not author, but if Wolfgang agrees, then I could indeed squash both LED commits together.

Wolfgang?

Amicalement,

Signature · 1 line

Albert.

Mike Frysinger

2011-09-12 20:28 UTC #6 lore raw

PATCH 1/1 led: remove camelcase in LED functions from assembly

Quoted 38 lines · On Monday, September 12, 2011 15:32:07 Albert ARIBAUD wrote:

Le 12/09/2011 18:27, Mike Frysinger a ?crit :
Quoted 37 lines · On Monday, September 12, 2011 01:31:45 Albert ARIBAUD wrote:
Quoted 26 lines
Le 12/09/2011 06:04, Mike Frysinger a ?crit :
Quoted 25 lines · On Sunday, September 11, 2011 18:22:26 Jason Kridner wrote:
Quoted 8 lines
This was done with the following command-line:
for file in find . | grep '\.[chS]$';
   do perl -i -pe 's/(green|yellow|red|blue)_LED_(on|off)/$1_led_$2/g'
   $file;
done
one line:
find . -name '*.[chS]' -exec \
	sed -ri 's/(green|yellow|red|blue)_LED_(on|off)/\1_led_\2/g'
arch/arm/cpu/arm1176/start.S clbss_l:str r2, [r0] /* clear loop... */
Quoted 7 lines
arch/arm/cpu/arm1176/start.S +1 -1
 
   	bl coloured_LED_init
 
-	bl red_LED_on
+	bl red_led_on
seems like you didnt fix coloured_LED_init
Quoted 6 lines
Quoted 2 lines
also, i dont see you changing any of the .c files where these funcs are actually defined
This patch is assumed to apply above the current git tip, where the function definitions were already changed, and only .S files should be fixed.
by "current git tip" i'm guessing you mean "current arm master". i was looking at the mainline u-boot master and the C files weren't changed.

Quoted 8 lines

Quoted 5 lines
Quoted 2 lines
Running MAKEALL arm right now, just to make sure, then I will apply it on top of u-boot-arm/master.
be nice to send out a single squashed patch to wolfgang rather than a few known-to-be-broken ones ...
As a rule, I'd rather not alter the commits I did not author, but if Wolfgang agrees, then I could indeed squash both LED commits together.

you dont need to do that. simply squash them into a branch and have wolfgang pull that branch. then when you merge his tree back, things get stitched sanely together via the merge commit.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110912/b00f3718/attachment.pgp

Wolfgang Denk

2011-09-12 20:58 UTC #7 lore raw

PATCH 1/1 led: remove camelcase in LED functions from assembly

In reply to Albert ARIBAUD

Dear Albert ARIBAUD,

Quoted 5 lines · In message <[email protected]> you wrote:

As a rule, I'd rather not alter the commits I did not author, but if Wolfgang agrees, then I could indeed squash both LED commits together.
Wolfgang?

Given the current state of affairs this seems to be the best. Please do.

Thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Artificial Intelligence is no match for natural stupidity.