ARCH: OMAP1: Move extern'ed prototypes to header files in arch/arm/mach-omap1

Prototypes with extern should rely only on header files so there's only
one copy of each.

It also helps when changing that function's prototype to get mis-uses of
that function.

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 74cb9186c4b5e90869768a1322c81e0f26497083..43f96272b067736b0195689696f05040f75d4050 100644 (file)
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -50,8 +50,6 @@
 #include <asm/arch/mcbsp.h>
 #include <asm/arch/omap-alsa.h>
 
-extern int omap_gpio_init(void);
-
 static int h2_keymap[] = {
        KEY(0, 0, KEY_LEFT),
        KEY(0, 1, KEY_RIGHT),
@@ -512,8 +510,6 @@ static int h2_nand_dev_ready(struct omap_nand_platform_data *data)
        return omap_get_gpio_datain(H2_NAND_RB_GPIO_PIN);
 }
 
-extern void __init h2_mmc_init(void);
-
 static void __init h2_init(void)
 {
        /* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 225d0983a2e273c2d6ea7e7f7934987b882a1ad9..b86df0aa34419b534aac825d0f808aa872789d1d 100644 (file)
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -57,8 +57,6 @@
 
 #include <../drivers/media/video/ov9640.h>
 
-extern int omap_gpio_init(void);
-
 static int h3_keymap[] = {
        KEY(0, 0, KEY_LEFT),
        KEY(0, 1, KEY_RIGHT),
@@ -675,8 +673,6 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = {
        },
 };
 
-extern void __init h3_mmc_init(void);
-
 static void __init h3_init(void)
 {
        /* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped

diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 4f7d7916251dc808b4b7a6a7fc38cbb7c19aaff3..b95c03eed19f516bab699caa4327e586f0b6638b 100644 (file)
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -430,8 +430,6 @@ static struct omap_gpio_switch sx1_gpio_switches[] __initdata = {
 
 /*-----------------------------------------*/
 
-extern void __init sx1_mmc_init(void);
-
 static void __init omap_sx1_init(void)
 {
        platform_add_devices(sx1_devices, ARRAY_SIZE(sx1_devices));

diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 04d9e8c3f047889f5d34188deb226933a51ff058..da8172defe3ab3a53f8214c01f90155b461fd2fb 100644 (file)
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -34,9 +34,6 @@
 #include <asm/arch/tc.h>
 #include <asm/arch/usb.h>
 
-extern void omap_init_time(void);
-extern int omap_gpio_init(void);
-
 static struct plat_serial8250_port voiceblue_ports[] = {
        {
                .mapbase        = (unsigned long)(OMAP_CS1_PHYS + 0x40000),

diff --git a/include/asm-arm/arch-omap/board-h2.h b/include/asm-arm/arch-omap/board-h2.h
index 88ae40345eea4b630b88f55826fc95cb3c9a2f68..c322796d0d26ce94d60b841f491ddfb326ab4e78 100644 (file)
--- a/include/asm-arm/arch-omap/board-h2.h
+++ b/include/asm-arm/arch-omap/board-h2.h
@@ -34,6 +34,7 @@
 /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
 #define OMAP1610_ETHR_START            0x04000300
 
+extern void h2_mmc_init(void);
 extern void h2_mmc_slot_cover_handler(void *arg, int state);
 
 #endif /*  __ASM_ARCH_OMAP_H2_H */

diff --git a/include/asm-arm/arch-omap/board-h3.h b/include/asm-arm/arch-omap/board-h3.h
index a3f2b210088c91eafb823db19fd0d2a9f3a777eb..1c2b55c61ca013b1f4704511a8e04b645368fdac 100644 (file)
--- a/include/asm-arm/arch-omap/board-h3.h
+++ b/include/asm-arm/arch-omap/board-h3.h
@@ -36,6 +36,7 @@
 
 #define NR_IRQS                                (MAXIRQNUM + 1)
 
+extern void __init h3_mmc_init(void);
 extern void h3_mmc_slot_cover_handler(void *arg, int state);
 
 #endif /*  __ASM_ARCH_OMAP_H3_H */

diff --git a/include/asm-arm/arch-omap/board-sx1.h b/include/asm-arm/arch-omap/board-sx1.h
index 75dd8c3463e400d19a51b9b230fc04b4e5e5d978..7773c26fc7e83245f3fdebe0b9f6cc182f2ff811 100644 (file)
--- a/include/asm-arm/arch-omap/board-sx1.h
+++ b/include/asm-arm/arch-omap/board-sx1.h
@@ -47,6 +47,7 @@ int i2c_read_byte(u8 devaddr, u8 regoffset, u8 * value);
 
 /* MMC prototypes */
 
+extern void __init sx1_mmc_init(void);
 extern void sx1_mmc_slot_cover_handler(void *arg, int state);
 
 #endif /* __ASM_ARCH_SX1_I2C_CHIPS_H */