Virtualization
/
opensbi
mirror of https://gitlab.com/qemu-project/opensbi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <git@danielschaefer.me>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
Daniel Schaefer 2021-05-13 12:52:35 +08:00 committed by Anup Patel
parent 26998f3d11
commit f90c4c2e02
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sbi/riscv_locks.h
View File

@ -34,9 +34,9 @@ typedef struct {
#define DEFINE_SPIN_LOCK(x) \
spinlock_t SPIN_LOCK_INIT(x)
int spin_lock_check(spinlock_t *lock);
bool spin_lock_check(spinlock_t *lock);
int spin_trylock(spinlock_t *lock);
bool spin_trylock(spinlock_t *lock);
void spin_lock(spinlock_t *lock);

6
lib/sbi/riscv_locks.c
View File

@ -8,7 +8,7 @@
#include <sbi/riscv_barrier.h>
#include <sbi/riscv_locks.h>
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)