arch/arm: Correct checkpatch errors

Correct whitespace issues in arch/arm and arch/arm64.
Enclose complex values in parenthesis.

Change-Id: I74b68f485adff1e6f0fa433e51e12b59ccea654b
Signed-off-by: Logan Carlson <logancarlson@google.com>
Reviewed-on: https://review.coreboot.org/19989
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
This commit is contained in:
Logan Carlson 2017-05-30 15:31:10 -06:00 committed by Martin Roth
parent f848ed091e
commit c058d1c0f8
7 changed files with 25 additions and 25 deletions

View File

@ -19,7 +19,7 @@ void __div0(void); // called from asm so no need for a prototype in a header
/* Replacement (=dummy) for GNU/Linux division-by zero handler */ /* Replacement (=dummy) for GNU/Linux division-by zero handler */
/* recursion is ok here because we have no formats ... */ /* recursion is ok here because we have no formats ... */
void __div0 (void) void __div0(void)
{ {
printk(BIOS_EMERG, "DIVIDE BY ZERO! continuing ...\n"); printk(BIOS_EMERG, "DIVIDE BY ZERO! continuing ...\n");
} }

View File

@ -20,8 +20,8 @@
#include <console/console.h> #include <console/console.h>
/* FIXME(dhendrix): prototypes added for assembler */ /* FIXME(dhendrix): prototypes added for assembler */
int raise (int signum) __attribute__((used)); int raise(int signum) __attribute__((used));
int raise (int signum) int raise(int signum)
{ {
printk(BIOS_CRIT, "raise: Signal # %d caught\n", signum); printk(BIOS_CRIT, "raise: Signal # %d caught\n", signum);
return 0; return 0;

View File

@ -15,12 +15,12 @@
#define _ARCH_SMP_SPINLOCK_H #define _ARCH_SMP_SPINLOCK_H
#define DECLARE_SPIN_LOCK(x) #define DECLARE_SPIN_LOCK(x)
#define barrier() do {} while(0) #define barrier() do {} while (0)
#define spin_is_locked(lock) 0 #define spin_is_locked(lock) 0
#define spin_unlock_wait(lock) do {} while(0) #define spin_unlock_wait(lock) do {} while (0)
#define spin_lock(lock) do {} while(0) #define spin_lock(lock) do {} while (0)
#define spin_unlock(lock) do {} while(0) #define spin_unlock(lock) do {} while (0)
#define cpu_relax() do {} while(0) #define cpu_relax() do {} while (0)
#include <smp/node.h> #include <smp/node.h>
#define boot_cpu() 1 #define boot_cpu() 1

View File

@ -54,8 +54,8 @@
* However, we use the CP15 based instructions because we use * However, we use the CP15 based instructions because we use
* -march=armv5 in U-Boot * -march=armv5 in U-Boot
*/ */
#define CP15ISB asm volatile ("mcr p15, 0, %0, c7, c5, 4" : : "r" (0)) #define CP15ISB (asm volatile ("mcr p15, 0, %0, c7, c5, 4" : : "r" (0)))
#define CP15DSB asm volatile ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)) #define CP15DSB (asm volatile ("mcr p15, 0, %0, c7, c10, 4" : : "r" (0)))
#define CP15DMB asm volatile ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0)) #define CP15DMB (asm volatile ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0)))
#endif /* ARMV7_H */ #endif /* ARMV7_H */

View File

@ -29,9 +29,9 @@ typedef struct {
#define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 } #define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 }
#define DECLARE_SPIN_LOCK(x) static spinlock_t x = SPIN_LOCK_UNLOCKED; #define DECLARE_SPIN_LOCK(x) static spinlock_t x = SPIN_LOCK_UNLOCKED;
#define barrier() __asm__ __volatile__("": : :"memory") #define barrier() (__asm__ __volatile__("" : : : "memory"))
#define spin_is_locked(x) (*(volatile char *)(&(x)->lock) != 0) #define spin_is_locked(x) (*(volatile char *)(&(x)->lock) != 0)
#define spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) #define spin_unlock_wait(x) do { barrier(); } while (spin_is_locked(x))
static inline __attribute__((always_inline)) void spin_lock(spinlock_t *lock) static inline __attribute__((always_inline)) void spin_lock(spinlock_t *lock)
{ {

View File

@ -85,7 +85,7 @@ static void dcache_op_va(void const *addr, size_t len, enum dcache_op op)
dsb(); dsb();
while ((void *)line < addr + len) { while ((void *)line < addr + len) {
switch(op) { switch (op) {
case OP_DCCIVAC: case OP_DCCIVAC:
dccivac(line); dccivac(line);
break; break;

View File

@ -23,55 +23,55 @@
void dccisw(uint64_t cisw) void dccisw(uint64_t cisw)
{ {
__asm__ __volatile__("dc cisw, %0\n\t" : : "r" (cisw) :"memory"); __asm__ __volatile__("dc cisw, %0\n\t" : : "r" (cisw) : "memory");
} }
void dccivac(uint64_t civac) void dccivac(uint64_t civac)
{ {
__asm__ __volatile__("dc civac, %0\n\t" : : "r" (civac) :"memory"); __asm__ __volatile__("dc civac, %0\n\t" : : "r" (civac) : "memory");
} }
void dccsw(uint64_t csw) void dccsw(uint64_t csw)
{ {
__asm__ __volatile__("dc csw, %0\n\t" : : "r" (csw) :"memory"); __asm__ __volatile__("dc csw, %0\n\t" : : "r" (csw) : "memory");
} }
void dccvac(uint64_t cvac) void dccvac(uint64_t cvac)
{ {
__asm__ __volatile__("dc cvac, %0\n\t" : : "r" (cvac) :"memory"); __asm__ __volatile__("dc cvac, %0\n\t" : : "r" (cvac) : "memory");
} }
void dccvau(uint64_t cvau) void dccvau(uint64_t cvau)
{ {
__asm__ __volatile__("dc cvau, %0\n\t" : : "r" (cvau) :"memory"); __asm__ __volatile__("dc cvau, %0\n\t" : : "r" (cvau) : "memory");
} }
void dcisw(uint64_t isw) void dcisw(uint64_t isw)
{ {
__asm__ __volatile__("dc isw, %0\n\t" : : "r" (isw) :"memory"); __asm__ __volatile__("dc isw, %0\n\t" : : "r" (isw) : "memory");
} }
void dcivac(uint64_t ivac) void dcivac(uint64_t ivac)
{ {
__asm__ __volatile__("dc ivac, %0\n\t" : : "r" (ivac) :"memory"); __asm__ __volatile__("dc ivac, %0\n\t" : : "r" (ivac) : "memory");
} }
void dczva(uint64_t zva) void dczva(uint64_t zva)
{ {
__asm__ __volatile__("dc zva, %0\n\t" : : "r" (zva) :"memory"); __asm__ __volatile__("dc zva, %0\n\t" : : "r" (zva) : "memory");
} }
void iciallu(void) void iciallu(void)
{ {
__asm__ __volatile__("ic iallu\n\t" : : :"memory"); __asm__ __volatile__("ic iallu\n\t" : : : "memory");
} }
void icialluis(void) void icialluis(void)
{ {
__asm__ __volatile__("ic ialluis\n\t" : : :"memory"); __asm__ __volatile__("ic ialluis\n\t" : : : "memory");
} }
void icivau(uint64_t ivau) void icivau(uint64_t ivau)
{ {
__asm__ __volatile__("ic ivau, %0\n\t" : : "r" (ivau) :"memory"); __asm__ __volatile__("ic ivau, %0\n\t" : : "r" (ivau) : "memory");
} }