Skip to contentSkip to conversation

ARM: OMAP: Fix warning in gpio.c

PATCH In review Dirk Behme 2 participants 2 messages Oct 3, 2007 – Oct 9, 2007

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 ARM: OMAP: Fix warning in gpio.c

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 <[email protected]>
arch/arm/plat-omap/gpio.c +6 -1
Index: 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;
#1 lore raw
Quoted 31 lines · Dirk Behme

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 <[email protected]>

Index: linux-osk/arch/arm/plat-omap/gpio.c
===================================================================

arch/arm/plat-omap/gpio.c +4 -1
@@ -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

arch/arm/plat-omap/gpio.c static int __init _omap_gpio_init(void) · line 1307

Quoted 9 lines
arch/arm/plat-omap/gpio.c +2 -0
@@ -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