common: board_f: cosmetic use __weak for leds

First of all this looks a lot better, but it also
prevents a gcc warning (W=1), that the weak function
has no previous prototype.

Change-Id: Icaabc39bf74587659b1070374b61e4022419a01a
cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jae-young Hwang <j-zero.hwang@samsung.com>

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index b131759661fffa8aa3e335c3c24428705302375e..1d3b730fdbcfc964cceef6e84dcbfa4f81b915c7 100644 (file)
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -83,25 +83,15 @@ extern void dataflash_print_info(void);
  ************************************************************************
  * May be supplied by boards if desired
  */
-inline void __coloured_LED_init(void) {}
-void coloured_LED_init(void)
-       __attribute__((weak, alias("__coloured_LED_init")));
-inline void __red_led_on(void) {}
-void red_led_on(void) __attribute__((weak, alias("__red_led_on")));
-inline void __red_led_off(void) {}
-void red_led_off(void) __attribute__((weak, alias("__red_led_off")));
-inline void __green_led_on(void) {}
-void green_led_on(void) __attribute__((weak, alias("__green_led_on")));
-inline void __green_led_off(void) {}
-void green_led_off(void) __attribute__((weak, alias("__green_led_off")));
-inline void __yellow_led_on(void) {}
-void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on")));
-inline void __yellow_led_off(void) {}
-void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off")));
-inline void __blue_led_on(void) {}
-void blue_led_on(void) __attribute__((weak, alias("__blue_led_on")));
-inline void __blue_led_off(void) {}
-void blue_led_off(void) __attribute__((weak, alias("__blue_led_off")));
+__weak void coloured_LED_init(void) {}
+__weak void red_led_on(void) {}
+__weak void red_led_off(void) {}
+__weak void green_led_on(void) {}
+__weak void green_led_off(void) {}
+__weak void yellow_led_on(void) {}
+__weak void yellow_led_off(void) {}
+__weak void blue_led_on(void) {}
+__weak void blue_led_off(void) {}
 
 /*
  ************************************************************************

diff --git a/include/status_led.h b/include/status_led.h
index c85c206772bc27d289a08623f3b8e1a301e0d448..22644517f6a0cfcc57011380b76517d947b55046 100644 (file)
--- a/include/status_led.h
+++ b/include/status_led.h
@@ -349,19 +349,21 @@ extern void __led_set (led_id_t mask, int state);
 # include <asm/status_led.h>
 #endif
 
+#endif /* CONFIG_STATUS_LED    */
+
 /*
  * Coloured LEDs API
  */
 #ifndef        __ASSEMBLY__
-extern void    coloured_LED_init (void);
-extern void    red_led_on(void);
-extern void    red_led_off(void);
-extern void    green_led_on(void);
-extern void    green_led_off(void);
-extern void    yellow_led_on(void);
-extern void    yellow_led_off(void);
-extern void    blue_led_on(void);
-extern void    blue_led_off(void);
+void coloured_LED_init(void);
+void red_led_on(void);
+void red_led_off(void);
+void green_led_on(void);
+void green_led_off(void);
+void yellow_led_on(void);
+void yellow_led_off(void);
+void blue_led_on(void);
+void blue_led_off(void);
 #else
        .extern LED_init
        .extern red_led_on
@@ -374,6 +376,4 @@ extern void blue_led_off(void);
        .extern blue_led_off
 #endif
 
-#endif /* CONFIG_STATUS_LED    */
-
 #endif /* _STATUS_LED_H_       */