Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / arch / arm / mach-tegra / tegra.c

diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c
index 6745a657d261c6a2cda6a55b35ff7953b0bc2c2e..e01cbca196b544f57e95ffb1e21e831b93adec03 100644 (file)
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@ -118,32 +118,14 @@ out:
        of_platform_default_populate(NULL, 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[] = {