| From foo@baz Wed Nov 28 09:43:07 CET 2018 |
| From: Stefan Agner <stefan@agner.ch> |
| Date: Tue, 8 May 2018 16:27:26 +0200 |
| Subject: bus: arm-cci: remove unnecessary unreachable() |
| |
| From: Stefan Agner <stefan@agner.ch> |
| |
| (commit 10d8713429d345867fc8998d6193b233c0cab28c upstream) |
| |
| 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> |
| Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/bus/arm-cci.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/bus/arm-cci.c |
| +++ b/drivers/bus/arm-cci.c |
| @@ -2103,8 +2103,6 @@ asmlinkage void __naked cci_enable_port_ |
| [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(); |
| } |
| |
| /** |