From f90c4c2e0298a6a6e7ade87bf1b704a3a07aa7b9 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Thu, 13 May 2021 12:52:35 +0800 Subject: lib: sbi: Have spinlock checks return bool spin_lock_check already returned bool in the source file but not in the header. With some toolchains that causes an error, as it should. Because it and related functions all essentially return a bool, we can use this opportunity to change them. Signed-off-by: Daniel Schaefer Reviewed-by: Anup Patel --- lib/sbi/riscv_locks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/sbi') diff --git a/lib/sbi/riscv_locks.c b/lib/sbi/riscv_locks.c index 75b443b..acab776 100644 --- a/lib/sbi/riscv_locks.c +++ b/lib/sbi/riscv_locks.c @@ -8,7 +8,7 @@ #include #include -static inline int spin_lock_unlocked(spinlock_t lock) +static inline bool spin_lock_unlocked(spinlock_t lock) { return lock.owner == lock.next; } @@ -19,7 +19,7 @@ bool spin_lock_check(spinlock_t *lock) return !spin_lock_unlocked(*lock); } -int spin_trylock(spinlock_t *lock) +bool spin_trylock(spinlock_t *lock) { unsigned long inc = 1u << TICKET_SHIFT; unsigned long mask = 0xffffu << TICKET_SHIFT; @@ -42,7 +42,7 @@ int spin_trylock(spinlock_t *lock) : "r"(inc), "r"(mask), "I"(TICKET_SHIFT) : "memory"); - return !l0; + return l0 == 0; } void spin_lock(spinlock_t *lock) -- cgit v1.2.3