summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2016-07-05 15:03:57 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2016-07-21 18:58:26 +1000
commitb521f576df6c49fcc06fbc06a349f7590f223a38 (patch)
tree497b35399a11df4d855ffc34e8e4bf7718a834f0
parent2b4e3ad8f5790cae6e0356c5fc200588bd2c915c (diff)
downloadlinux-b521f576df6c49fcc06fbc06a349f7590f223a38.tar.gz
linux-b521f576df6c49fcc06fbc06a349f7590f223a38.tar.bz2
linux-b521f576df6c49fcc06fbc06a349f7590f223a38.zip
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>
-rw-r--r--arch/powerpc/platforms/powermac/setup.c3
1 files changed, 0 insertions, 3 deletions
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);