leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: uniphier: remove useless wrapper functions

Browse Source 
The wrapper functions, uniphier_board_*, are just making function
calls complex.  Remove them.

Also, use empty inline functions in case CONFIG_MICRO_SUPPORT_CARD
is disabled, so that prototype checking works.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2015-09-22 00:27:30 +09:00
parent f1378cabc0
commit 0b198670c6
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-uniphier/board_early_init_r.c
View File

@ -1,6 +1,5 @@
/* /*
* Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -10,6 +9,6 @@
int board_early_init_r(void) int board_early_init_r(void)
{ {
uniphier_board_late_init(); support_card_late_init();
return 0; return 0;
} }

30
arch/arm/mach-uniphier/include/mach/board.h
View File

@ -13,28 +13,22 @@ void support_card_init(void);
void support_card_late_init(void); void support_card_late_init(void);
int check_support_card(void); int check_support_card(void);
#else #else
#define support_card_reset() do {} while (0) static inline void support_card_reset(void)
#define support_card_init() do {} while (0) {
#define support_card_late_init() do {} while (0) }
static inline void support_card_init(void)
{
}
static inline void support_card_late_init(void)
{
}
static inline int check_support_card(void) static inline int check_support_card(void)
{ {
return 0; return 0;
} }
#endif #endif
static inline void uniphier_board_reset(void)
{
support_card_reset();
}
static inline void uniphier_board_init(void)
{
support_card_init();
}
static inline void uniphier_board_late_init(void)
{
support_card_late_init();
}
#endif /* ARCH_BOARD_H */ #endif /* ARCH_BOARD_H */

4
arch/arm/mach-uniphier/spl.c
View File

@ -40,11 +40,11 @@ void spl_board_init(void)
sg_init(); sg_init();
uniphier_board_reset(); support_card_reset();
pll_init(); pll_init();
uniphier_board_init(); support_card_init();
led_write(L, 0, , ); led_write(L, 0, , );