summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-22 00:27:30 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-25 00:27:53 +0900
commit0b198670c6525392337462282efeaefe459e14cd (patch)
treed14dd5fd12d3ecfcb75dd9036e1f6f8ef46cbacd /arch/arm/mach-uniphier
parentf1378cabc0d340393bc7e0312f5e1f70d5d19434 (diff)
downloadtalos-obmc-uboot-0b198670c6525392337462282efeaefe459e14cd.tar.gz
talos-obmc-uboot-0b198670c6525392337462282efeaefe459e14cd.zip
ARM: uniphier: remove useless wrapper functions
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>
Diffstat (limited to 'arch/arm/mach-uniphier')
-rw-r--r--arch/arm/mach-uniphier/board_early_init_r.c5
-rw-r--r--arch/arm/mach-uniphier/include/mach/board.h18
-rw-r--r--arch/arm/mach-uniphier/spl.c4
3 files changed, 10 insertions, 17 deletions
diff --git a/arch/arm/mach-uniphier/board_early_init_r.c b/arch/arm/mach-uniphier/board_early_init_r.c
index 579fe70463..7d4830a3a8 100644
--- a/arch/arm/mach-uniphier/board_early_init_r.c
+++ b/arch/arm/mach-uniphier/board_early_init_r.c
@@ -1,6 +1,5 @@
/*
- * Copyright (C) 2014 Panasonic Corporation
- * Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -10,6 +9,6 @@
int board_early_init_r(void)
{
- uniphier_board_late_init();
+ support_card_late_init();
return 0;
}
diff --git a/arch/arm/mach-uniphier/include/mach/board.h b/arch/arm/mach-uniphier/include/mach/board.h
index c039d807f4..5b9af222ae 100644
--- a/arch/arm/mach-uniphier/include/mach/board.h
+++ b/arch/arm/mach-uniphier/include/mach/board.h
@@ -13,28 +13,22 @@ void support_card_init(void);
void support_card_late_init(void);
int check_support_card(void);
#else
-#define support_card_reset() do {} while (0)
-#define support_card_init() do {} while (0)
-#define support_card_late_init() do {} while (0)
-static inline int check_support_card(void)
+static inline void support_card_reset(void)
{
- return 0;
}
-#endif
-static inline void uniphier_board_reset(void)
+static inline void support_card_init(void)
{
- support_card_reset();
}
-static inline void uniphier_board_init(void)
+static inline void support_card_late_init(void)
{
- support_card_init();
}
-static inline void uniphier_board_late_init(void)
+static inline int check_support_card(void)
{
- support_card_late_init();
+ return 0;
}
+#endif
#endif /* ARCH_BOARD_H */
diff --git a/arch/arm/mach-uniphier/spl.c b/arch/arm/mach-uniphier/spl.c
index 78534fc41c..661d73ae4a 100644
--- a/arch/arm/mach-uniphier/spl.c
+++ b/arch/arm/mach-uniphier/spl.c
@@ -40,11 +40,11 @@ void spl_board_init(void)
sg_init();
- uniphier_board_reset();
+ support_card_reset();
pll_init();
- uniphier_board_init();
+ support_card_init();
led_write(L, 0, , );
OpenPOWER on IntegriCloud