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@xxxxxxxxxxx>
---
arch/arm/mach-omap1/board-h2.c | 4 ----
arch/arm/mach-omap1/board-h3.c | 4 ----
arch/arm/mach-omap1/board-sx1.c | 2 --
arch/arm/mach-omap1/board-voiceblue.c | 3 ---
include/asm-arm/arch-omap/board-h2.h | 1 +
include/asm-arm/arch-omap/board-h3.h | 1 +
include/asm-arm/arch-omap/board-sx1.h | 1 +
7 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 74cb918..43f9627 100644
--- 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 225d098..b86df0a 100644
--- 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 4f7d791..b95c03e 100644
--- 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 04d9e8c..da8172d 100644
--- 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 88ae403..c322796 100644
--- 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 a3f2b21..1c2b55c 100644
--- 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 75dd8c3..7773c26 100644
--- 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 */
--
1.5.4.rc0.56.g6fbe
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
