From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 5 Jul 2016 05:03:57 +0000 (+1000)
Subject: powerpc/pmac: Remove spurrious machine type test
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b521f576df6c49fcc06fbc06a349f7590f223a38;p=linux-beck.git

powerpc/pmac: Remove spurrious machine type test

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>
---

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 795bf8cfddd9..8fffe1c4b6f5 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -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);