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

[PATCH] semaphore: Remove __MUTEX_INITIALIZER()

__MUTEX_INITIALIZER() has no users, and equates to the more commonly used
DECLARE_MUTEX(), thus making it pretty much redundant. Remove it for good.

Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Arthur Othieno and committed by
Linus Torvalds 727a53bd d269cdd0

-67
-3
include/asm-alpha/semaphore.h
··· 26 26 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ 27 27 } 28 28 29 - #define __MUTEX_INITIALIZER(name) \ 30 - __SEMAPHORE_INITIALIZER(name,1) 31 - 32 29 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 33 30 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 34 31
-2
include/asm-arm/semaphore.h
··· 24 24 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ 25 25 } 26 26 27 - #define __MUTEX_INITIALIZER(name) __SEMAPHORE_INIT(name,1) 28 - 29 27 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 30 28 struct semaphore name = __SEMAPHORE_INIT(name,count) 31 29
-3
include/asm-arm26/semaphore.h
··· 25 25 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \ 26 26 } 27 27 28 - #define __MUTEX_INITIALIZER(name) \ 29 - __SEMAPHORE_INIT(name,1) 30 - 31 28 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 32 29 struct semaphore name = __SEMAPHORE_INIT(name,count) 33 30
-3
include/asm-cris/semaphore.h
··· 33 33 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 34 34 } 35 35 36 - #define __MUTEX_INITIALIZER(name) \ 37 - __SEMAPHORE_INITIALIZER(name,1) 38 - 39 36 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 40 37 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 41 38
-3
include/asm-frv/semaphore.h
··· 47 47 #define __SEMAPHORE_INITIALIZER(name,count) \ 48 48 { count, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) __SEM_DEBUG_INIT(name) } 49 49 50 - #define __MUTEX_INITIALIZER(name) \ 51 - __SEMAPHORE_INITIALIZER(name,1) 52 - 53 50 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 54 51 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 55 52
-3
include/asm-h8300/semaphore.h
··· 35 35 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 36 36 } 37 37 38 - #define __MUTEX_INITIALIZER(name) \ 39 - __SEMAPHORE_INITIALIZER(name,1) 40 - 41 38 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 42 39 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 43 40
-3
include/asm-i386/semaphore.h
··· 55 55 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 56 56 } 57 57 58 - #define __MUTEX_INITIALIZER(name) \ 59 - __SEMAPHORE_INITIALIZER(name,1) 60 - 61 58 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 62 59 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 63 60
-2
include/asm-ia64/semaphore.h
··· 24 24 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 25 25 } 26 26 27 - #define __MUTEX_INITIALIZER(name) __SEMAPHORE_INITIALIZER(name,1) 28 - 29 27 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 30 28 struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) 31 29
-3
include/asm-m32r/semaphore.h
··· 32 32 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 33 33 } 34 34 35 - #define __MUTEX_INITIALIZER(name) \ 36 - __SEMAPHORE_INITIALIZER(name,1) 37 - 38 35 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 39 36 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 40 37
-3
include/asm-m68k/semaphore.h
··· 36 36 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 37 37 } 38 38 39 - #define __MUTEX_INITIALIZER(name) \ 40 - __SEMAPHORE_INITIALIZER(name,1) 41 - 42 39 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 43 40 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 44 41
-3
include/asm-m68knommu/semaphore.h
··· 35 35 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 36 36 } 37 37 38 - #define __MUTEX_INITIALIZER(name) \ 39 - __SEMAPHORE_INITIALIZER(name,1) 40 - 41 38 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 42 39 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 43 40
-3
include/asm-mips/semaphore.h
··· 45 45 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 46 46 } 47 47 48 - #define __MUTEX_INITIALIZER(name) \ 49 - __SEMAPHORE_INITIALIZER(name, 1) 50 - 51 48 #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ 52 49 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 53 50
-3
include/asm-parisc/semaphore.h
··· 49 49 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 50 50 } 51 51 52 - #define __MUTEX_INITIALIZER(name) \ 53 - __SEMAPHORE_INITIALIZER(name,1) 54 - 55 52 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 56 53 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 57 54
-3
include/asm-ppc/semaphore.h
··· 37 37 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 38 38 } 39 39 40 - #define __MUTEX_INITIALIZER(name) \ 41 - __SEMAPHORE_INITIALIZER(name, 1) 42 - 43 40 #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ 44 41 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 45 42
-3
include/asm-ppc64/semaphore.h
··· 31 31 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 32 32 } 33 33 34 - #define __MUTEX_INITIALIZER(name) \ 35 - __SEMAPHORE_INITIALIZER(name, 1) 36 - 37 34 #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ 38 35 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 39 36
-3
include/asm-s390/semaphore.h
··· 29 29 #define __SEMAPHORE_INITIALIZER(name,count) \ 30 30 { ATOMIC_INIT(count), __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) } 31 31 32 - #define __MUTEX_INITIALIZER(name) \ 33 - __SEMAPHORE_INITIALIZER(name,1) 34 - 35 32 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 36 33 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 37 34
-3
include/asm-sh/semaphore.h
··· 33 33 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 34 34 } 35 35 36 - #define __MUTEX_INITIALIZER(name) \ 37 - __SEMAPHORE_INITIALIZER(name,1) 38 - 39 36 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 40 37 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 41 38
-3
include/asm-sh64/semaphore.h
··· 40 40 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 41 41 } 42 42 43 - #define __MUTEX_INITIALIZER(name) \ 44 - __SEMAPHORE_INITIALIZER(name,1) 45 - 46 43 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 47 44 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 48 45
-3
include/asm-sparc/semaphore.h
··· 22 22 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 23 23 } 24 24 25 - #define __MUTEX_INITIALIZER(name) \ 26 - __SEMAPHORE_INITIALIZER(name,1) 27 - 28 25 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 29 26 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 30 27
-3
include/asm-sparc64/semaphore.h
··· 22 22 { ATOMIC_INIT(count), \ 23 23 __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) } 24 24 25 - #define __MUTEX_INITIALIZER(name) \ 26 - __SEMAPHORE_INITIALIZER(name, 1) 27 - 28 25 #define __DECLARE_SEMAPHORE_GENERIC(name, count) \ 29 26 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 30 27
-3
include/asm-v850/semaphore.h
··· 18 18 { ATOMIC_INIT (count), 0, \ 19 19 __WAIT_QUEUE_HEAD_INITIALIZER ((name).wait) } 20 20 21 - #define __MUTEX_INITIALIZER(name) \ 22 - __SEMAPHORE_INITIALIZER (name,1) 23 - 24 21 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 25 22 struct semaphore name = __SEMAPHORE_INITIALIZER (name,count) 26 23
-3
include/asm-x86_64/semaphore.h
··· 56 56 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 57 57 } 58 58 59 - #define __MUTEX_INITIALIZER(name) \ 60 - __SEMAPHORE_INITIALIZER(name,1) 61 - 62 59 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 63 60 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 64 61
-3
include/asm-xtensa/semaphore.h
··· 29 29 .wait = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \ 30 30 } 31 31 32 - #define __MUTEX_INITIALIZER(name) \ 33 - __SEMAPHORE_INITIALIZER(name, 1) 34 - 35 32 #define __DECLARE_SEMAPHORE_GENERIC(name,count) \ 36 33 struct semaphore name = __SEMAPHORE_INITIALIZER(name,count) 37 34