From 54d3d40d3798a89ca35836decdc0c1e69dcd105f Mon Sep 17 00:00:00 2001 From: Jeroen Hofstee Date: Mon, 23 Jun 2014 23:20:19 +0200 Subject: [PATCH] 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 Signed-off-by: Jeroen Hofstee Acked-by: Simon Glass Signed-off-by: Jae-young Hwang --- arch/arm/lib/board.c | 28 +++++++++------------------- include/status_led.h | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index b13175966..1d3b730fd 100644 --- 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 c85c20677..22644517f 100644 --- 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 #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_ */ -- 2.34.1