Skip to content

Commit 5e669ec

Browse files
committed
ARM: sunxi: Remove init_machine callback
The init_machine hook is now at its default value. We can remove it. Even though the sun4i and sun7i machines are nothing more than generic machines now, leave them in so that we won't have to add them back if needed, and so that the machine is still displayed in /proc/cpuinfo. Signed-off-by: Maxime Ripard <[email protected]>
1 parent 5536005 commit 5e669ec

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

arch/arm/mach-sunxi/sunxi.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,9 @@
1212

1313
#include <linux/clk-provider.h>
1414
#include <linux/clocksource.h>
15-
#include <linux/of_platform.h>
1615

1716
#include <asm/mach/arch.h>
1817

19-
static void __init sunxi_dt_init(void)
20-
{
21-
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
22-
}
23-
2418
static const char * const sunxi_board_dt_compat[] = {
2519
"allwinner,sun4i-a10",
2620
"allwinner,sun5i-a10s",
@@ -29,7 +23,6 @@ static const char * const sunxi_board_dt_compat[] = {
2923
};
3024

3125
DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
32-
.init_machine = sunxi_dt_init,
3326
.dt_compat = sunxi_board_dt_compat,
3427
MACHINE_END
3528

@@ -47,7 +40,6 @@ static void __init sun6i_timer_init(void)
4740
}
4841

4942
DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
50-
.init_machine = sunxi_dt_init,
5143
.init_time = sun6i_timer_init,
5244
.dt_compat = sun6i_board_dt_compat,
5345
MACHINE_END
@@ -58,6 +50,5 @@ static const char * const sun7i_board_dt_compat[] = {
5850
};
5951

6052
DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")
61-
.init_machine = sunxi_dt_init,
6253
.dt_compat = sun7i_board_dt_compat,
6354
MACHINE_END

0 commit comments

Comments
 (0)