Commit 10d87134 authored May 08, 2018 by Stefan Agner Committed by Olof Johansson May 14, 2018

bus: arm-cci: remove unnecessary unreachable()



Mixing asm and C code is not recommended in a naked function by
gcc and leads to an error when using clang:
  drivers/bus/arm-cci.c:2107:2: error: non-ASM statement in naked
  function is not supported
        unreachable();
        ^

While the function is marked __naked it actually properly return
in asm. There is no need for the unreachable() call.

GCC 7.2 generates identical object files before and after, other
than (for obvious reasons) the line numbers generated by
WANT_WARN_ON_SLOWPATH for all the WARN()s appearing later in the
file.

Suggested-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent 67b8d5c7

drivers/bus/arm-cci.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -371,8 +371,6 @@ asmlinkage void __naked cci_enable_port_for_self(void)
		[sizeof_struct_cpu_port] "i" (sizeof(struct cpu_port)),
		[sizeof_struct_ace_port] "i" (sizeof(struct cci_ace_port)),
		[offsetof_port_phys] "i" (offsetof(struct cci_ace_port, phys)) );

		unreachable();
		}

		/**

Admin message