linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: fix lcd power build failure in collie_defconfig
@ 2012-04-02 22:17 Paul Gortmaker
  2012-04-03  4:55 ` Olof Johansson
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Gortmaker @ 2012-04-02 22:17 UTC (permalink / raw)
  To: linux-arm-kernel; +Cc: linux-next, Paul Gortmaker, arm

Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1

  "FB: sa1100: remove global sa1100fb_.*_power function pointers"

got rid of all instances but one in locomolcd.c -- which was
conditional on CONFIG_SA1100_COLLIE.  The associated .power
field which replaces the global is populated in mach-sa1100/collie.c
so move the assignment there, but make it conditional on the
locomolcd support, so use CONFIG_BACKLIGHT_LOCOMO in that file.

Cc: arm@kernel.org
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[ unchanged from original Mar6 send, just adding rmk ack ]

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 48885b7..c7f418b 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -313,6 +313,10 @@ static struct sa1100fb_mach_info collie_lcd_info = {
 
 	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
 	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
+
+#ifdef CONFIG_BACKLIGHT_LOCOMO
+	.lcd_power	= locomolcd_power
+#endif
 };
 
 static void __init collie_init(void)
diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
index 52acda7..f33679d 100644
--- a/arch/arm/mach-sa1100/include/mach/collie.h
+++ b/arch/arm/mach-sa1100/include/mach/collie.h
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-sa1100/include/mach/collie.h
  *
- * This file contains the hardware specific definitions for Assabet
+ * This file contains the hardware specific definitions for Collie
  * Only include this file from SA1100-specific files.
  *
  * ChangeLog:
@@ -13,6 +13,7 @@
 #ifndef __ASM_ARCH_COLLIE_H
 #define __ASM_ARCH_COLLIE_H
 
+extern void locomolcd_power(int on);
 
 #define COLLIE_SCOOP_GPIO_BASE	(GPIO_MAX + 1)
 #define COLLIE_GPIO_CHARGE_ON	(COLLIE_SCOOP_GPIO_BASE + 0)
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index be20b5c..3a6d541 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -229,14 +229,7 @@ static struct locomo_driver poodle_lcd_driver = {
 
 static int __init locomolcd_init(void)
 {
-	int ret = locomo_driver_register(&poodle_lcd_driver);
-	if (ret)
-		return ret;
-
-#ifdef CONFIG_SA1100_COLLIE
-	sa1100fb_lcd_power = locomolcd_power;
-#endif
-	return 0;
+	return locomo_driver_register(&poodle_lcd_driver);
 }
 
 static void __exit locomolcd_exit(void)
-- 
1.7.9.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: fix lcd power build failure in collie_defconfig
  2012-04-02 22:17 [PATCH] ARM: fix lcd power build failure in collie_defconfig Paul Gortmaker
@ 2012-04-03  4:55 ` Olof Johansson
  0 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2012-04-03  4:55 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-arm-kernel, linux-next, arm

On Mon, Apr 02, 2012 at 06:17:17PM -0400, Paul Gortmaker wrote:
> Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1
> 
>   "FB: sa1100: remove global sa1100fb_.*_power function pointers"
> 
> got rid of all instances but one in locomolcd.c -- which was
> conditional on CONFIG_SA1100_COLLIE.  The associated .power
> field which replaces the global is populated in mach-sa1100/collie.c
> so move the assignment there, but make it conditional on the
> locomolcd support, so use CONFIG_BACKLIGHT_LOCOMO in that file.
> 
> Cc: arm@kernel.org
> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Thanks, applied to fixes.


-Olof

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: fix lcd power build failure in collie_defconfig
  2012-03-21 12:47 ` Florian Tobias Schandinat
@ 2012-03-21 14:02   ` Paul Gortmaker
  0 siblings, 0 replies; 5+ messages in thread
From: Paul Gortmaker @ 2012-03-21 14:02 UTC (permalink / raw)
  To: Florian Tobias Schandinat; +Cc: linux, rpurdie, linux-arm-kernel, linux-next

On 12-03-21 08:47 AM, Florian Tobias Schandinat wrote:
> On 03/06/2012 04:31 PM, Paul Gortmaker wrote:
>> Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1 (linux-next)
>>
>>   "FB: sa1100: remove global sa1100fb_.*_power function pointers"
>>
>> got rid of all instances but one in locomolcd.c -- which was
>> conditional on CONFIG_SA1100_COLLIE.  The associated .power
>> field which replaces the global is populated in mach-sa1100/collie.c
>> so move the assignment there, but make it conditional on the
>> locomolcd support, so use CONFIG_BACKLIGHT_LOCOMO in that file.
>>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> What about this patch?
> I assumed Russel would pick it up as the commit referenced is also in
> his tree but it looks like this patch is still not in -next. Any reasons
> for this?

Not that I'm aware of.  I didn't get any negative feedback or change
requests asking for a v2.   There are probably about a half dozen
linux-next build failures in my triage list that I've fixed but
the commits have not yet looped back around through the various
maintainers for one reason or another.

http://marc.info/?l=linux-next&m=133227360822405&w=2

It would be nice to have them all crossed off...

Paul.
---

> 
> 
> Best regards,
> 
> Florian Tobias Schandinat
> 
>>
>> diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
>> index 48885b7..c7f418b 100644
>> --- a/arch/arm/mach-sa1100/collie.c
>> +++ b/arch/arm/mach-sa1100/collie.c
>> @@ -313,6 +313,10 @@ static struct sa1100fb_mach_info collie_lcd_info = {
>>  
>>  	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
>>  	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
>> +
>> +#ifdef CONFIG_BACKLIGHT_LOCOMO
>> +	.lcd_power	= locomolcd_power
>> +#endif
>>  };
>>  
>>  static void __init collie_init(void)
>> diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
>> index 52acda7..f33679d 100644
>> --- a/arch/arm/mach-sa1100/include/mach/collie.h
>> +++ b/arch/arm/mach-sa1100/include/mach/collie.h
>> @@ -1,7 +1,7 @@
>>  /*
>>   * arch/arm/mach-sa1100/include/mach/collie.h
>>   *
>> - * This file contains the hardware specific definitions for Assabet
>> + * This file contains the hardware specific definitions for Collie
>>   * Only include this file from SA1100-specific files.
>>   *
>>   * ChangeLog:
>> @@ -13,6 +13,7 @@
>>  #ifndef __ASM_ARCH_COLLIE_H
>>  #define __ASM_ARCH_COLLIE_H
>>  
>> +extern void locomolcd_power(int on);
>>  
>>  #define COLLIE_SCOOP_GPIO_BASE	(GPIO_MAX + 1)
>>  #define COLLIE_GPIO_CHARGE_ON	(COLLIE_SCOOP_GPIO_BASE + 0)
>> diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
>> index be20b5c..3a6d541 100644
>> --- a/drivers/video/backlight/locomolcd.c
>> +++ b/drivers/video/backlight/locomolcd.c
>> @@ -229,14 +229,7 @@ static struct locomo_driver poodle_lcd_driver = {
>>  
>>  static int __init locomolcd_init(void)
>>  {
>> -	int ret = locomo_driver_register(&poodle_lcd_driver);
>> -	if (ret)
>> -		return ret;
>> -
>> -#ifdef CONFIG_SA1100_COLLIE
>> -	sa1100fb_lcd_power = locomolcd_power;
>> -#endif
>> -	return 0;
>> +	return locomo_driver_register(&poodle_lcd_driver);
>>  }
>>  
>>  static void __exit locomolcd_exit(void)
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: fix lcd power build failure in collie_defconfig
  2012-03-06 16:31 Paul Gortmaker
@ 2012-03-21 12:47 ` Florian Tobias Schandinat
  2012-03-21 14:02   ` Paul Gortmaker
  0 siblings, 1 reply; 5+ messages in thread
From: Florian Tobias Schandinat @ 2012-03-21 12:47 UTC (permalink / raw)
  To: Paul Gortmaker, linux; +Cc: rpurdie, linux-arm-kernel, linux-next

On 03/06/2012 04:31 PM, Paul Gortmaker wrote:
> Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1 (linux-next)
> 
>   "FB: sa1100: remove global sa1100fb_.*_power function pointers"
> 
> got rid of all instances but one in locomolcd.c -- which was
> conditional on CONFIG_SA1100_COLLIE.  The associated .power
> field which replaces the global is populated in mach-sa1100/collie.c
> so move the assignment there, but make it conditional on the
> locomolcd support, so use CONFIG_BACKLIGHT_LOCOMO in that file.
> 
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

What about this patch?
I assumed Russel would pick it up as the commit referenced is also in
his tree but it looks like this patch is still not in -next. Any reasons
for this?


Best regards,

Florian Tobias Schandinat

> 
> diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
> index 48885b7..c7f418b 100644
> --- a/arch/arm/mach-sa1100/collie.c
> +++ b/arch/arm/mach-sa1100/collie.c
> @@ -313,6 +313,10 @@ static struct sa1100fb_mach_info collie_lcd_info = {
>  
>  	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
>  	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
> +
> +#ifdef CONFIG_BACKLIGHT_LOCOMO
> +	.lcd_power	= locomolcd_power
> +#endif
>  };
>  
>  static void __init collie_init(void)
> diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
> index 52acda7..f33679d 100644
> --- a/arch/arm/mach-sa1100/include/mach/collie.h
> +++ b/arch/arm/mach-sa1100/include/mach/collie.h
> @@ -1,7 +1,7 @@
>  /*
>   * arch/arm/mach-sa1100/include/mach/collie.h
>   *
> - * This file contains the hardware specific definitions for Assabet
> + * This file contains the hardware specific definitions for Collie
>   * Only include this file from SA1100-specific files.
>   *
>   * ChangeLog:
> @@ -13,6 +13,7 @@
>  #ifndef __ASM_ARCH_COLLIE_H
>  #define __ASM_ARCH_COLLIE_H
>  
> +extern void locomolcd_power(int on);
>  
>  #define COLLIE_SCOOP_GPIO_BASE	(GPIO_MAX + 1)
>  #define COLLIE_GPIO_CHARGE_ON	(COLLIE_SCOOP_GPIO_BASE + 0)
> diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
> index be20b5c..3a6d541 100644
> --- a/drivers/video/backlight/locomolcd.c
> +++ b/drivers/video/backlight/locomolcd.c
> @@ -229,14 +229,7 @@ static struct locomo_driver poodle_lcd_driver = {
>  
>  static int __init locomolcd_init(void)
>  {
> -	int ret = locomo_driver_register(&poodle_lcd_driver);
> -	if (ret)
> -		return ret;
> -
> -#ifdef CONFIG_SA1100_COLLIE
> -	sa1100fb_lcd_power = locomolcd_power;
> -#endif
> -	return 0;
> +	return locomo_driver_register(&poodle_lcd_driver);
>  }
>  
>  static void __exit locomolcd_exit(void)

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH] ARM: fix lcd power build failure in collie_defconfig
@ 2012-03-06 16:31 Paul Gortmaker
  2012-03-21 12:47 ` Florian Tobias Schandinat
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Gortmaker @ 2012-03-06 16:31 UTC (permalink / raw)
  To: linux
  Cc: rpurdie, FlorianSchandinat, linux-arm-kernel, linux-next, Paul Gortmaker

Commit 086ada54abaa4316e8603f02410fe8ebc9ba2de1 (linux-next)

  "FB: sa1100: remove global sa1100fb_.*_power function pointers"

got rid of all instances but one in locomolcd.c -- which was
conditional on CONFIG_SA1100_COLLIE.  The associated .power
field which replaces the global is populated in mach-sa1100/collie.c
so move the assignment there, but make it conditional on the
locomolcd support, so use CONFIG_BACKLIGHT_LOCOMO in that file.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 48885b7..c7f418b 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -313,6 +313,10 @@ static struct sa1100fb_mach_info collie_lcd_info = {
 
 	.lccr0		= LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
 	.lccr3		= LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
+
+#ifdef CONFIG_BACKLIGHT_LOCOMO
+	.lcd_power	= locomolcd_power
+#endif
 };
 
 static void __init collie_init(void)
diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
index 52acda7..f33679d 100644
--- a/arch/arm/mach-sa1100/include/mach/collie.h
+++ b/arch/arm/mach-sa1100/include/mach/collie.h
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-sa1100/include/mach/collie.h
  *
- * This file contains the hardware specific definitions for Assabet
+ * This file contains the hardware specific definitions for Collie
  * Only include this file from SA1100-specific files.
  *
  * ChangeLog:
@@ -13,6 +13,7 @@
 #ifndef __ASM_ARCH_COLLIE_H
 #define __ASM_ARCH_COLLIE_H
 
+extern void locomolcd_power(int on);
 
 #define COLLIE_SCOOP_GPIO_BASE	(GPIO_MAX + 1)
 #define COLLIE_GPIO_CHARGE_ON	(COLLIE_SCOOP_GPIO_BASE + 0)
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index be20b5c..3a6d541 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -229,14 +229,7 @@ static struct locomo_driver poodle_lcd_driver = {
 
 static int __init locomolcd_init(void)
 {
-	int ret = locomo_driver_register(&poodle_lcd_driver);
-	if (ret)
-		return ret;
-
-#ifdef CONFIG_SA1100_COLLIE
-	sa1100fb_lcd_power = locomolcd_power;
-#endif
-	return 0;
+	return locomo_driver_register(&poodle_lcd_driver);
 }
 
 static void __exit locomolcd_exit(void)
-- 
1.7.9.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-04-03  4:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-02 22:17 [PATCH] ARM: fix lcd power build failure in collie_defconfig Paul Gortmaker
2012-04-03  4:55 ` Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2012-03-06 16:31 Paul Gortmaker
2012-03-21 12:47 ` Florian Tobias Schandinat
2012-03-21 14:02   ` Paul Gortmaker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).