Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04fc8bbc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatar"Satyam Sharma" <satyam.sharma@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4029a917

drivers/usb/storage/libusual.c

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static atomic_t usu_bias = ATOMIC_INIT(USB_US_DEFAULT_BIAS); 
#define BIAS_NAME_SIZE  (sizeof("usb-storage"))

static const char *bias_names[3] = { "none", "usb-storage", "ub" };



static DECLARE_MUTEX_LOCKED(usu_init_notify);

static struct semaphore usu_init_notify;

static DECLARE_COMPLETION(usu_end_notify);

static atomic_t total_threads = ATOMIC_INIT(0);
@@ -204,6 +204,8 @@ static int __init usb_usual_init(void) 
{

	int rc;



	sema_init(&usu_init_notify, 0);



	rc = usb_register(&usu_driver);

	up(&usu_init_notify);

	return rc;

include/asm-alpha/semaphore.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ struct semaphore { 
	struct semaphore name = __SEMAPHORE_INITIALIZER(name,count)



#define DECLARE_MUTEX(name)		__DECLARE_SEMAPHORE_GENERIC(name,1)

#define DECLARE_MUTEX_LOCKED(name)	__DECLARE_SEMAPHORE_GENERIC(name,0)



static inline void sema_init(struct semaphore *sem, int val)

{

include/asm-arm/semaphore.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct semaphore { 
	struct semaphore name = __SEMAPHORE_INIT(name,count)



#define DECLARE_MUTEX(name)		__DECLARE_SEMAPHORE_GENERIC(name,1)

#define DECLARE_MUTEX_LOCKED(name)	__DECLARE_SEMAPHORE_GENERIC(name,0)



static inline void sema_init(struct semaphore *sem, int val)

{

include/asm-avr32/semaphore.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct semaphore { 
	struct semaphore name = __SEMAPHORE_INITIALIZER(name,count)



#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)

#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0)



static inline void sema_init (struct semaphore *sem, int val)

{

include/asm-blackfin/semaphore.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct semaphore { 
	struct semaphore name = __SEMAPHORE_INITIALIZER(name,count)



#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)

#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0)



static inline void sema_init(struct semaphore *sem, int val)

{