OSDN Git Service

MIPS: ralink: Remove ralink_halt()
authorNeilBrown <neil@brown.name>
Tue, 20 Mar 2018 08:29:51 +0000 (19:29 +1100)
committerJames Hogan <jhogan@kernel.org>
Wed, 21 Mar 2018 23:43:39 +0000 (23:43 +0000)
commit891731f6a5dbe508d12443175a7e166a2fba616a
treec05df82e54139b41ffbd2ed9763514ca65f17746
parenta821328c2f3003b908880792d71b2781b44fa53c
MIPS: ralink: Remove ralink_halt()

ralink_halt() does nothing that machine_halt() doesn't already do, so it
adds no value.

It actually causes incorrect behaviour due to the "unreachable()" at the
end. This tells the compiler that the end of the function will never be
reached, which isn't true. The compiler responds by not adding a
'return' instruction, so control simply moves on to whatever bytes come
afterwards in memory. In my tested, that was the ralink_restart()
function. This means that an attempt to 'halt' the machine would
actually cause a reboot.

So remove ralink_halt() so that a 'halt' really does halt.

Fixes: c06e836ada59 ("MIPS: ralink: adds reset code")
Signed-off-by: NeilBrown <neil@brown.name>
Cc: John Crispin <john@phrozen.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 3.9+
Patchwork: https://patchwork.linux-mips.org/patch/18851/
Signed-off-by: James Hogan <jhogan@kernel.org>
arch/mips/ralink/reset.c