Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 04fc8bbcf5eb25fa2aec290b302a9878dde20168

Authored by Christoph Hellwig
Committed by Linus Torvalds
1 parent 4029a9177f
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 24 changed files with 3 additions and 24 deletions Side-by-side Diff

drivers/usb/storage/libusual.c
Diff comments   View file @ 04fc8bb
... ... @@ -30,7 +30,7 @@
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,6 +203,8 @@
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);
include/asm-alpha/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -30,7 +30,6 @@
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 {
include/asm-arm/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -28,7 +28,6 @@
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 {
include/asm-avr32/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -36,7 +36,6 @@
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 {
include/asm-blackfin/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -35,7 +35,6 @@
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 {
include/asm-cris/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -35,7 +35,6 @@
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 {
include/asm-frv/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -49,7 +49,6 @@
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 {
include/asm-h8300/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -39,7 +39,6 @@
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 {
include/asm-ia64/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -28,7 +28,6 @@
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)
include/asm-m32r/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -35,7 +35,6 @@
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 {
include/asm-m68k/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -40,7 +40,6 @@
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 {
include/asm-m68knommu/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -39,7 +39,6 @@
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 {
include/asm-mips/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -49,7 +49,6 @@
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 {
include/asm-parisc/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -53,7 +53,6 @@
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 {
include/asm-powerpc/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -35,7 +35,6 @@
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 {
include/asm-s390/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -33,7 +33,6 @@
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 {
include/asm-sh/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -37,7 +37,6 @@
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 {
include/asm-sh64/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -44,7 +44,6 @@
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 {
include/asm-sparc/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -26,7 +26,6 @@
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 {
include/asm-sparc64/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -26,7 +26,6 @@
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 {
include/asm-v850/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -22,7 +22,6 @@
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 {
include/asm-x86/semaphore_32.h
Diff comments   View file @ 04fc8bb
... ... @@ -59,7 +59,6 @@
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 {
include/asm-x86/semaphore_64.h
Diff comments   View file @ 04fc8bb
... ... @@ -60,7 +60,6 @@
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 {
include/asm-xtensa/semaphore.h
Diff comments   View file @ 04fc8bb
... ... @@ -33,7 +33,6 @@
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 {