[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[Jason Kridner]

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

Signed-off-by: Jason Kridner <jdk@ti.com>
---
 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(-)

diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 0aa613d..848144a 100644
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -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
 
diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index 00fa8c9..540e3c2 100644
--- a/arch/arm/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
@@ -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
 
 /*
diff --git a/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S b/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S
index a20ec89..f21e237 100644
--- a/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S
@@ -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
diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
index c308420..8c5612c 100644
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -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
 
 /*
diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S
index 17cf5dc..dbb93ef 100644
--- a/arch/arm/cpu/arm925t/start.S
+++ b/arch/arm/cpu/arm925t/start.S
@@ -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
 
 /*
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index 16e35c2..d164d6d 100644
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -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
 
 /*
diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S
index ba96208..2033b36 100644
--- a/arch/arm/cpu/arm_intcm/start.S
+++ b/arch/arm/cpu/arm_intcm/start.S
@@ -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
 
 /*
diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S
index b17d267..cb32121 100644
--- a/arch/arm/cpu/ixp/start.S
+++ b/arch/arm/cpu/ixp/start.S
@@ -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
 
 /*
diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S
index 2545cf6..a29d5b4 100644
--- a/arch/arm/cpu/s3c44b0/start.S
+++ b/arch/arm/cpu/s3c44b0/start.S
@@ -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
 
 /*
-- 
1.7.4.1

[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[Mike Frysinger]

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'

> --- a/arch/arm/cpu/arm1176/start.S
> +++ b/arch/arm/cpu/arm1176/start.S
> 
>  	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 

[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[Albert ARIBAUD]

Hi Mike,

Le 12/09/2011 06:04, Mike Frysinger a ?crit :
> 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'
>
>> --- a/arch/arm/cpu/arm1176/start.S
>> +++ b/arch/arm/cpu/arm1176/start.S
>>
>>   	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

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,
-- 
Albert.

[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[Albert ARIBAUD]

Le 12/09/2011 07:31, Albert ARIBAUD a ?crit :
> Hi Mike,
>
> Le 12/09/2011 06:04, Mike Frysinger a ?crit :
>> 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'
>>
>>> --- a/arch/arm/cpu/arm1176/start.S
>>> +++ b/arch/arm/cpu/arm1176/start.S
>>>
>>>    	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
>
> 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,
-- 
Albert.

[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[Mike Frysinger]

On Monday, September 12, 2011 01:31:45 Albert ARIBAUD wrote:
> Le 12/09/2011 06:04, Mike Frysinger a ?crit :
> > 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'
> > 	
> >> --- a/arch/arm/cpu/arm1176/start.S
> >> +++ b/arch/arm/cpu/arm1176/start.S
> >> 
> >>   	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
> 
> 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.

> 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 

[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[Albert ARIBAUD]

Le 12/09/2011 18:27, Mike Frysinger a ?crit :
> On Monday, September 12, 2011 01:31:45 Albert ARIBAUD wrote:
>> Le 12/09/2011 06:04, Mike Frysinger a ?crit :
>>> 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'
>>> 	
>>>> --- a/arch/arm/cpu/arm1176/start.S
>>>> +++ b/arch/arm/cpu/arm1176/start.S
>>>>
>>>>    	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
>>
>> 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.
>
>> 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,
-- 
Albert.

[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[Mike Frysinger]

On Monday, September 12, 2011 15:32:07 Albert ARIBAUD wrote:
> Le 12/09/2011 18:27, Mike Frysinger a ?crit :
> > On Monday, September 12, 2011 01:31:45 Albert ARIBAUD wrote:
> >> Le 12/09/2011 06:04, Mike Frysinger a ?crit :
> >>> 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'
> >>> 	
> >>>> --- a/arch/arm/cpu/arm1176/start.S
> >>>> +++ b/arch/arm/cpu/arm1176/start.S
> >>>> 
> >>>>    	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
> >> 
> >> 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.
> > 
> >> 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 

[U-Boot] [PATCH] led: remove camelcase in LED functions from assembly

[Wolfgang Denk]

Dear Albert ARIBAUD,

In message <4E6E5E37.9040104@aribaud.net> 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

-- 
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.