summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/embedded6xx/gamecube.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/gamecube.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/gamecube.c')
-rw-r--r--arch/powerpc/platforms/embedded6xx/gamecube.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/gamecube.c b/arch/powerpc/platforms/embedded6xx/gamecube.c
index f5a837fa8951..36789cec957c 100644
--- a/arch/powerpc/platforms/embedded6xx/gamecube.c
+++ b/arch/powerpc/platforms/embedded6xx/gamecube.c
@@ -54,11 +54,6 @@ static void __noreturn gamecube_halt(void)
gamecube_restart(NULL);
}
-static void __init gamecube_init_early(void)
-{
- ug_udbg_init();
-}
-
static int __init gamecube_probe(void)
{
if (!of_machine_is_compatible("nintendo,gamecube"))
@@ -66,6 +61,8 @@ static int __init gamecube_probe(void)
pm_power_off = gamecube_power_off;
+ ug_udbg_init();
+
return 1;
}
@@ -77,7 +74,6 @@ static void gamecube_shutdown(void)
define_machine(gamecube) {
.name = "gamecube",
.probe = gamecube_probe,
- .init_early = gamecube_init_early,
.restart = gamecube_restart,
.halt = gamecube_halt,
.init_IRQ = flipper_pic_probe,