]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
powerpc/pmac: Remove spurrious machine type test
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 5 Jul 2016 05:03:57 +0000 (15:03 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 21 Jul 2016 08:58:26 +0000 (18:58 +1000)
pmac_declare_of_platform_devices() is already a machine initcall, thus
it won't be called on a non-powermac machine. Testing for chrp there
is pointless.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powermac/setup.c

index 795bf8cfddd90cec086738da77ce15cc336d8d50..8fffe1c4b6f50847290d32e10452f99112732ffd 100644 (file)
@@ -484,9 +484,6 @@ static int __init pmac_declare_of_platform_devices(void)
 {
        struct device_node *np;
 
-       if (machine_is(chrp))
-               return -1;
-
        np = of_find_node_by_name(NULL, "valkyrie");
        if (np) {
                of_platform_device_create(np, "valkyrie", NULL);