summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/embedded6xx/wii.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2016-07-05 08:04:06 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2016-07-21 12:07:26 +0300
commitf2d576948d6cec16e4aae201d738c4f22039a551 (patch)
treedcbe46fe2c9fbe05c9c8e1668ff5a1076c07a3fe /arch/powerpc/platforms/embedded6xx/wii.c
parent565713840445b7ccafb28dc1230d57d40bcb42a5 (diff)
downloadlinux-f2d576948d6cec16e4aae201d738c4f22039a551.tar.xz
powerpc: Get rid of ppc_md.init_early()
It is now called right after platform probe, so the probe function can just do the job. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/wii.c')
-rw-r--r--arch/powerpc/platforms/embedded6xx/wii.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index fe3e769db263..3fd683e40bc9 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -192,11 +192,6 @@ static void __noreturn wii_halt(void)
wii_spin();
}
-static void __init wii_init_early(void)
-{
- ug_udbg_init();
-}
-
static void __init wii_pic_probe(void)
{
flipper_pic_probe();
@@ -210,6 +205,8 @@ static int __init wii_probe(void)
pm_power_off = wii_power_off;
+ ug_udbg_init();
+
return 1;
}
@@ -222,7 +219,6 @@ static void wii_shutdown(void)
define_machine(wii) {
.name = "wii",
.probe = wii_probe,
- .init_early = wii_init_early,
.setup_arch = wii_setup_arch,
.restart = wii_restart,
.halt = wii_halt,