提交 da35cbca 编写于 作者: A Arnd Bergmann 提交者: Thierry Reding

ARM: tegra: Remove board_init_funcs array

In a configuration that enables CONFIG_UBSAN_SANITIZE_ALL, I am getting
a section mismatch warning for tegra20:

WARNING: arch/arm/mach-tegra/built-in.o(.data+0x6e0): Section mismatch in reference from the variable board_init_funcs to the function .init.text:paz00_init()

The array is no longer useful here since there is only one entry,
so we can simply call the function directly after checking
of_machine_is_compatible(). This fixes the section mismatch
and is easier to read.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NThierry Reding <treding@nvidia.com>
上级 fa45caf2
...@@ -118,32 +118,14 @@ static void __init tegra_dt_init(void) ...@@ -118,32 +118,14 @@ static void __init tegra_dt_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, parent); of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
} }
static void __init paz00_init(void)
{
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
tegra_paz00_wifikill_init();
}
static struct {
char *machine;
void (*init)(void);
} board_init_funcs[] = {
{ "compal,paz00", paz00_init },
};
static void __init tegra_dt_init_late(void) static void __init tegra_dt_init_late(void)
{ {
int i;
tegra_init_suspend(); tegra_init_suspend();
tegra_cpuidle_init(); tegra_cpuidle_init();
for (i = 0; i < ARRAY_SIZE(board_init_funcs); i++) { if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&
if (of_machine_is_compatible(board_init_funcs[i].machine)) { of_machine_is_compatible("compal,paz00"))
board_init_funcs[i].init(); tegra_paz00_wifikill_init();
break;
}
}
} }
static const char * const tegra_dt_board_compat[] = { static const char * const tegra_dt_board_compat[] = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册