Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da35cbca authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Thierry Reding
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent fa45caf2

arch/arm/mach-tegra/tegra.c

+3 −21
Original line number Diff line number Diff line
@@ -118,32 +118,14 @@ static void __init tegra_dt_init(void) 
	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)

{

	int i;



	tegra_init_suspend();

	tegra_cpuidle_init();



	for (i = 0; i < ARRAY_SIZE(board_init_funcs); i++) {

		if (of_machine_is_compatible(board_init_funcs[i].machine)) {

			board_init_funcs[i].init();

			break;

		}

	}

	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&

	    of_machine_is_compatible("compal,paz00"))

		tegra_paz00_wifikill_init();

}



static const char * const tegra_dt_board_compat[] = {