diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2023-02-18 10:15:48 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-03-16 08:56:48 +1100 |
| commit | f47b17d51997cd47e0e6fb1b90145d516ebe6b3e (patch) | |
| tree | 4dcdff8979de867a72056993b175cf33e7fcfa71 | |
| parent | 357f82395cd8a0279067805841e5968f4e6dc932 (diff) | |
| download | linux-f47b17d51997cd47e0e6fb1b90145d516ebe6b3e.tar.gz linux-f47b17d51997cd47e0e6fb1b90145d516ebe6b3e.tar.bz2 linux-f47b17d51997cd47e0e6fb1b90145d516ebe6b3e.zip | |
powerpc/gamecube|wii : Use machine_device_initcall()
Instead of checking machine type in the function,
use machine_device_initcall().
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/6cb9865d916231c38401ba34ad1a98c249fae135.1676711562.git.christophe.leroy@csgroup.eu
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/gamecube.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/wii.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/gamecube.c b/arch/powerpc/platforms/embedded6xx/gamecube.c index 4fc84ff95b5e..60cdc2852c7a 100644 --- a/arch/powerpc/platforms/embedded6xx/gamecube.c +++ b/arch/powerpc/platforms/embedded6xx/gamecube.c @@ -83,11 +83,8 @@ static const struct of_device_id gamecube_of_bus[] = { static int __init gamecube_device_probe(void) { - if (!machine_is(gamecube)) - return 0; - of_platform_bus_probe(NULL, gamecube_of_bus, NULL); return 0; } -device_initcall(gamecube_device_probe); +machine_device_initcall(gamecube, gamecube_device_probe); diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c index f2cc00e6f12f..635c393d307a 100644 --- a/arch/powerpc/platforms/embedded6xx/wii.c +++ b/arch/powerpc/platforms/embedded6xx/wii.c @@ -161,13 +161,10 @@ static const struct of_device_id wii_of_bus[] = { static int __init wii_device_probe(void) { - if (!machine_is(wii)) - return 0; - of_platform_populate(NULL, wii_of_bus, NULL, NULL); return 0; } -device_initcall(wii_device_probe); +machine_device_initcall(wii, wii_device_probe); define_machine(wii) { .name = "wii", |