[PATCH] ARM: OMAP: Fix warning in gpio.c

[PATCH] ARM: OMAP: Fix warning in gpio.c

[Dirk Behme]

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


Fix warning

arch/arm/plat-omap/gpio.c: In function '_omap_gpio_init':
arch/arm/plat-omap/gpio.c:1299: warning: unused variable 'clk_name'
arch/arm/plat-omap/gpio.c: At top level:
arch/arm/plat-omap/gpio.c:1282: warning: 'gpio_fck' defined but not used

for OMAP1.

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>


[-- Attachment #2: gpio_warning_fix.txt --]
[-- Type: text/plain, Size: 727 bytes --]

Index: linux-osk/arch/arm/plat-omap/gpio.c
===================================================================
--- linux-osk.orig/arch/arm/plat-omap/gpio.c
+++ linux-osk/arch/arm/plat-omap/gpio.c
@@ -1277,8 +1277,11 @@ static inline void mpuio_init(void) {}
 /*---------------------------------------------------------------------*/
 
 static int initialized;
-#if !defined(CONFIG_ARCH_OMAP34XX)
+#if !defined(CONFIG_ARCH_OMAP3)
 static struct clk * gpio_ick;
+#endif
+
+#if defined(CONFIG_ARCH_OMAP2)
 static struct clk * gpio_fck;
 #endif
 
@@ -1296,7 +1299,9 @@ static int __init _omap_gpio_init(void)
 {
 	int i;
 	struct gpio_bank *bank;
+#if defined(CONFIG_ARCH_OMAP3)
 	char clk_name[11];
+#endif
 
 	initialized = 1;
 

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

Re: [PATCH] ARM: OMAP: Fix warning in gpio.c

[Tony Lindgren]

* Dirk Behme <dirk.behme@googlemail.com> [071003 00:11]:
>
> Fix warning
>
> arch/arm/plat-omap/gpio.c: In function '_omap_gpio_init':
> arch/arm/plat-omap/gpio.c:1299: warning: unused variable 'clk_name'
> arch/arm/plat-omap/gpio.c: At top level:
> arch/arm/plat-omap/gpio.c:1282: warning: 'gpio_fck' defined but not used
>
> for OMAP1.
>
> Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
>

> Index: linux-osk/arch/arm/plat-omap/gpio.c
> ===================================================================
> --- linux-osk.orig/arch/arm/plat-omap/gpio.c
> +++ linux-osk/arch/arm/plat-omap/gpio.c
> @@ -1277,8 +1277,11 @@ static inline void mpuio_init(void) {}
>  /*---------------------------------------------------------------------*/
>  
>  static int initialized;
> -#if !defined(CONFIG_ARCH_OMAP34XX)
> +#if !defined(CONFIG_ARCH_OMAP3)
>  static struct clk * gpio_ick;
> +#endif
> +
> +#if defined(CONFIG_ARCH_OMAP2)
>  static struct clk * gpio_fck;
>  #endif
>  
> @@ -1296,7 +1299,9 @@ static int __init _omap_gpio_init(void)
>  {
>  	int i;
>  	struct gpio_bank *bank;
> +#if defined(CONFIG_ARCH_OMAP3)
>  	char clk_name[11];
> +#endif
>  
>  	initialized = 1;
>  

Pushing today.

Tony