locking: Further name space cleanups

The name space hierarchy for the internal lock functions is now a bit
backwards. raw_spin* functions map to _spin* which use __spin*, while
we would like to have _raw_spin* and __raw_spin*.

_raw_spin* is already used by lock debugging, so rename those funtions
to do_raw_spin* to free up the _raw_spin* name space.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2009-12-03 20:55:53 +01:00
parent 5f6384c5fb
commit 9828ea9d75
8 changed files with 81 additions and 81 deletions

View file

@ -125,7 +125,7 @@ static void __spin_lock_debug(raw_spinlock_t *lock)
}
}
void _raw_spin_lock(raw_spinlock_t *lock)
void do_raw_spin_lock(raw_spinlock_t *lock)
{
debug_spin_lock_before(lock);
if (unlikely(!arch_spin_trylock(&lock->raw_lock)))
@ -133,7 +133,7 @@ void _raw_spin_lock(raw_spinlock_t *lock)
debug_spin_lock_after(lock);
}
int _raw_spin_trylock(raw_spinlock_t *lock)
int do_raw_spin_trylock(raw_spinlock_t *lock)
{
int ret = arch_spin_trylock(&lock->raw_lock);
@ -148,7 +148,7 @@ int _raw_spin_trylock(raw_spinlock_t *lock)
return ret;
}
void _raw_spin_unlock(raw_spinlock_t *lock)
void do_raw_spin_unlock(raw_spinlock_t *lock)
{
debug_spin_unlock(lock);
arch_spin_unlock(&lock->raw_lock);
@ -193,13 +193,13 @@ static void __read_lock_debug(rwlock_t *lock)
}
#endif
void _raw_read_lock(rwlock_t *lock)
void do_raw_read_lock(rwlock_t *lock)
{
RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
arch_read_lock(&lock->raw_lock);
}
int _raw_read_trylock(rwlock_t *lock)
int do_raw_read_trylock(rwlock_t *lock)
{
int ret = arch_read_trylock(&lock->raw_lock);
@ -212,7 +212,7 @@ int _raw_read_trylock(rwlock_t *lock)
return ret;
}
void _raw_read_unlock(rwlock_t *lock)
void do_raw_read_unlock(rwlock_t *lock)
{
RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
arch_read_unlock(&lock->raw_lock);
@ -268,14 +268,14 @@ static void __write_lock_debug(rwlock_t *lock)
}
#endif
void _raw_write_lock(rwlock_t *lock)
void do_raw_write_lock(rwlock_t *lock)
{
debug_write_lock_before(lock);
arch_write_lock(&lock->raw_lock);
debug_write_lock_after(lock);
}
int _raw_write_trylock(rwlock_t *lock)
int do_raw_write_trylock(rwlock_t *lock)
{
int ret = arch_write_trylock(&lock->raw_lock);
@ -290,7 +290,7 @@ int _raw_write_trylock(rwlock_t *lock)
return ret;
}
void _raw_write_unlock(rwlock_t *lock)
void do_raw_write_unlock(rwlock_t *lock)
{
debug_write_unlock(lock);
arch_write_unlock(&lock->raw_lock);