[PATCH] fix compile h3

[PATCH] fix compile h3

[Komal Shah]

[-- Attachment #1: Type: text/plain, Size: 865 bytes --]

Tony,

Patch fixes following error and selects the GPIOEXPANDER for H3 board.

arch/arm/mach-omap1/board-h3.c: In function `h3_transceiver_mode':
arch/arm/mach-omap1/board-h3.c:253: error: incompatible type for
argument 1 of `cancel_delayed_work'
arch/arm/mach-omap1/board-h3.c:254: error: invalid type argument of
`->'
arch/arm/mach-omap1/board-h3.c:254: error: invalid type argument of
`->'
arch/arm/mach-omap1/board-h3.c:255: error: incompatible type for
argument 1 of `schedule_work'
make[1]: *** [arch/arm/mach-omap1/board-h3.o] Error 1
make: *** [arch/arm/mach-omap1] Error 2

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>

Sorry for this mistake :(

---Komal Shah
http://komalshah.blogspot.com/

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 

[-- Attachment #2: 3029636071-fixh3-linking.patch --]
[-- Type: text/plain, Size: 1036 bytes --]

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index f17b4ac..e89e4fd 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -36,6 +36,7 @@ config MACH_OMAP_H2
 config MACH_OMAP_H3
 	bool "TI H3 Support"
 	depends on ARCH_OMAP1 && ARCH_OMAP16XX
+	select GPIOEXPANDER_OMAP
     	help
 	  TI OMAP 1710 H3 board support. Say Y here if you have such
 	  a board.
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 826e741..60311d2 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -250,9 +250,9 @@ static int h3_transceiver_mode(struct de
 {
 	struct omap_irda_config *irda_config = dev->platform_data;
 
-	cancel_delayed_work(irda_config->gpio_expa);
-	PREPARE_WORK(irda_config->gpio_expa, set_trans_mode, &mode);
-	schedule_work(irda_config->gpio_expa);
+	cancel_delayed_work(&irda_config->gpio_expa);
+	PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);
+	schedule_work(&irda_config->gpio_expa);
 
 	return 0;
 }

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] fix compile h3

[Tony Lindgren]

* Komal Shah <komal_shah802003@yahoo.com> [060114 09:00]:
> Tony,
> 
> Patch fixes following error and selects the GPIOEXPANDER for H3 board.
> 
> arch/arm/mach-omap1/board-h3.c: In function `h3_transceiver_mode':
> arch/arm/mach-omap1/board-h3.c:253: error: incompatible type for
> argument 1 of `cancel_delayed_work'
> arch/arm/mach-omap1/board-h3.c:254: error: invalid type argument of
> `->'
> arch/arm/mach-omap1/board-h3.c:254: error: invalid type argument of
> `->'
> arch/arm/mach-omap1/board-h3.c:255: error: incompatible type for
> argument 1 of `schedule_work'
> make[1]: *** [arch/arm/mach-omap1/board-h3.o] Error 1
> make: *** [arch/arm/mach-omap1] Error 2
> 
> Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
> 
> Sorry for this mistake :(
> 
> ---Komal Shah
> http://komalshah.blogspot.com/
> 
> __________________________________________________
> Do You Yahoo!?
> Tired of spam?  Yahoo! Mail has the best spam protection around 
> http://mail.yahoo.com 
Content-Description: 3029636071-fixh3-linking.patch
> diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
> index f17b4ac..e89e4fd 100644
> --- a/arch/arm/mach-omap1/Kconfig
> +++ b/arch/arm/mach-omap1/Kconfig
> @@ -36,6 +36,7 @@ config MACH_OMAP_H2
>  config MACH_OMAP_H3
>  	bool "TI H3 Support"
>  	depends on ARCH_OMAP1 && ARCH_OMAP16XX
> +	select GPIOEXPANDER_OMAP
>      	help
>  	  TI OMAP 1710 H3 board support. Say Y here if you have such
>  	  a board.
> diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
> index 826e741..60311d2 100644
> --- a/arch/arm/mach-omap1/board-h3.c
> +++ b/arch/arm/mach-omap1/board-h3.c
> @@ -250,9 +250,9 @@ static int h3_transceiver_mode(struct de
>  {
>  	struct omap_irda_config *irda_config = dev->platform_data;
>  
> -	cancel_delayed_work(irda_config->gpio_expa);
> -	PREPARE_WORK(irda_config->gpio_expa, set_trans_mode, &mode);
> -	schedule_work(irda_config->gpio_expa);
> +	cancel_delayed_work(&irda_config->gpio_expa);
> +	PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);
> +	schedule_work(&irda_config->gpio_expa);
>  
>  	return 0;
>  }

Thanks, pushing this today.

Tony