tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

kill DECLARE_MUTEX_LOCKED

DECLARE_MUTEX_LOCKED was used for semaphores used as completions and we've
got rid of them. Well, except for one in libusual that the maintainer
explicitly wants to keep as semaphore. So convert that useage to an
explicit sema_init and kill of DECLARE_MUTEX_LOCKED so that new code is
reminded to use a completion.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: "Satyam Sharma" <satyam.sharma@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Christoph Hellwig and committed by
Linus Torvalds 04fc8bbc 4029a917

+3 -24
+3 -1
drivers/usb/storage/libusual.c
··· 30 30 #define BIAS_NAME_SIZE (sizeof("usb-storage")) 31 31 static const char *bias_names[3] = { "none", "usb-storage", "ub" }; 32 32 33 - static DECLARE_MUTEX_LOCKED(usu_init_notify); 33 + static struct semaphore usu_init_notify; 34 34 static DECLARE_COMPLETION(usu_end_notify); 35 35 static atomic_t total_threads = ATOMIC_INIT(0); 36 36 ··· 203 203 static int __init usb_usual_init(void) 204 204 { 205 205 int rc; 206 + 207 + sema_init(&usu_init_notify, 0); 206 208 207 209 rc = usb_register(&usu_driver); 208 210 up(&usu_init_notify);
-1
include/asm-alpha/semaphore.h
··· 30 30 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 31 31 32 32 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 33 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 34 33 35 34 static inline void sema_init(struct semaphore *sem, int val) 36 35 {
-1
include/asm-arm/semaphore.h
··· 28 28 struct semaphore name = __SEMAPHORE_INIT(name,count) 29 29 30 30 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 31 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 32 31 33 32 static inline void sema_init(struct semaphore *sem, int val) 34 33 {
-1
include/asm-avr32/semaphore.h
··· 36 36 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 37 37 38 38 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 39 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 40 39 41 40 static inline void sema_init (struct semaphore *sem, int val) 42 41 {
-1
include/asm-blackfin/semaphore.h
··· 35 35 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 36 36 37 37 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 38 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 39 38 40 39 static inline void sema_init(struct semaphore *sem, int val) 41 40 {
-1
include/asm-cris/semaphore.h
··· 35 35 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 36 36 37 37 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 38 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 39 38 40 39 static inline void sema_init(struct semaphore *sem, int val) 41 40 {
-1
include/asm-frv/semaphore.h
··· 49 49 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 50 50 51 51 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 52 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 53 52 54 53 static inline void sema_init (struct semaphore *sem, int val) 55 54 {
-1
include/asm-h8300/semaphore.h
··· 39 39 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 40 40 41 41 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 42 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 43 42 44 43 static inline void sema_init (struct semaphore *sem, int val) 45 44 {
-1
include/asm-ia64/semaphore.h
··· 28 28 struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) 29 29 30 30 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) 31 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) 32 31 33 32 static inline void 34 33 sema_init (struct semaphore *sem, int val)
-1
include/asm-m32r/semaphore.h
··· 35 35 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 36 36 37 37 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 38 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 39 38 40 39 static inline void sema_init (struct semaphore *sem, int val) 41 40 {
-1
include/asm-m68k/semaphore.h
··· 40 40 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 41 41 42 42 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 43 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 44 43 45 44 static inline void sema_init(struct semaphore *sem, int val) 46 45 {
-1
include/asm-m68knommu/semaphore.h
··· 39 39 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 40 40 41 41 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 42 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 43 42 44 43 static inline void sema_init (struct semaphore *sem, int val) 45 44 {
-1
include/asm-mips/semaphore.h
··· 49 49 struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) 50 50 51 51 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) 52 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) 53 52 54 53 static inline void sema_init(struct semaphore *sem, int val) 55 54 {
-1
include/asm-parisc/semaphore.h
··· 53 53 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 54 54 55 55 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 56 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 57 56 58 57 extern inline void sema_init (struct semaphore *sem, int val) 59 58 {
-1
include/asm-powerpc/semaphore.h
··· 35 35 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 36 36 37 37 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) 38 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) 39 38 40 39 static inline void sema_init (struct semaphore *sem, int val) 41 40 {
-1
include/asm-s390/semaphore.h
··· 33 33 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 34 34 35 35 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 36 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 37 36 38 37 static inline void sema_init (struct semaphore *sem, int val) 39 38 {
-1
include/asm-sh/semaphore.h
··· 37 37 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 38 38 39 39 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 40 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 41 40 42 41 static inline void sema_init (struct semaphore *sem, int val) 43 42 {
-1
include/asm-sh64/semaphore.h
··· 44 44 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 45 45 46 46 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 47 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 48 47 49 48 static inline void sema_init (struct semaphore *sem, int val) 50 49 {
-1
include/asm-sparc/semaphore.h
··· 26 26 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 27 27 28 28 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 29 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 30 29 31 30 static inline void sema_init (struct semaphore *sem, int val) 32 31 {
-1
include/asm-sparc64/semaphore.h
··· 26 26 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 27 27 28 28 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) 29 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) 30 29 31 30 static inline void sema_init (struct semaphore *sem, int val) 32 31 {
-1
include/asm-v850/semaphore.h
··· 22 22 struct semaphore name = __SEMAPHORE_INITIALIZER (name,count) 23 23 24 24 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC (name,1) 25 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC (name,0) 26 25 27 26 static inline void sema_init (struct semaphore *sem, int val) 28 27 {
-1
include/asm-x86/semaphore_32.h
··· 59 59 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 60 60 61 61 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 62 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 63 62 64 63 static inline void sema_init (struct semaphore *sem, int val) 65 64 {
-1
include/asm-x86/semaphore_64.h
··· 60 60 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 61 61 62 62 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 63 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 64 63 65 64 static inline void sema_init (struct semaphore *sem, int val) 66 65 {
-1
include/asm-xtensa/semaphore.h
··· 33 33 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 34 34 35 35 #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1) 36 - #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0) 37 36 38 37 static inline void sema_init (struct semaphore *sem, int val) 39 38 {