ARM: 6749/1: fold lookup_machine_type() into setup_machine()
authorNicolas Pitre <nicolas.pitre@linaro.org>
Mon, 21 Feb 2011 06:00:32 +0000 (07:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 23 Feb 2011 16:13:17 +0000 (16:13 +0000)
commitdce72dd08c976c9e5e1367bf994b306b15ae87fe
tree3713d0935cf6d5c9c3a642ef9b851fd41b4f4dd8
parent3a6b1676c6f27f7fad1a3d6fab5a95f90b1e7402
ARM: 6749/1: fold lookup_machine_type() into setup_machine()

Since commit 6fc31d54 there is no callers for lookup_machine_type()
other than setup_machine(). And if the former fails it won't return,
therefore the error path in the later is dead code.  Let's clean
things up by merging them together.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/setup.c