Commit 0f0800f1 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

staging: Bulk convert the semaphore mess 



init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert
staging users.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d6835e84

drivers/staging/comedi/drivers/dt9812.c

+1 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ static int __init usb_dt9812_init(void) 


	/* Initialize all driver slots */

	for (i = 0; i < DT9812_NUM_SLOTS; i++) {

		init_MUTEX(&dt9812[i].mutex);

		sema_init(&dt9812[i].mutex, 1);

		dt9812[i].serial = 0;

		dt9812[i].usb = NULL;

		dt9812[i].comedi = NULL;

drivers/staging/cxt1e1/functions.c

+2 −2
Original line number Diff line number Diff line
@@ -184,10 +184,10 @@ OS_sem_init (void *sem, int state) 
    switch (state)

    {

        case SEM_TAKEN:

        init_MUTEX_LOCKED ((struct semaphore *) sem);

		sema_init((struct semaphore *) sem, 0);

        break;

    case SEM_AVAILABLE:

        init_MUTEX ((struct semaphore *) sem);

	    sema_init((struct semaphore *) sem, 1);

        break;

    default:                        /* otherwise, set sem.count to state's

                                     * value */

drivers/staging/dream/pmem.c

+1 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,7 @@ int pmem_setup(struct android_pmem_platform_data *pdata, 
	pmem[id].ioctl = ioctl;

	pmem[id].release = release;

	init_rwsem(&pmem[id].bitmap_sem);

	init_MUTEX(&pmem[id].data_list_sem);

	sema_init(&pmem[id].data_list_sem, 1);

	INIT_LIST_HEAD(&pmem[id].data_list);

	pmem[id].dev.name = pdata->name;

	pmem[id].dev.minor = id;

drivers/staging/msm/mddihost.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ void mddi_init(void) 


	mddi_host_initialized = TRUE;



	init_MUTEX(&mddi_host_mutex);

	sema_init(&mddi_host_mutex, 1);



	if (!mddi_host_powered) {

		down(&mddi_host_mutex);

drivers/staging/msm/mdp.c

+5 −5
Original line number Diff line number Diff line
@@ -669,24 +669,24 @@ static void mdp_drv_init(void) 


	/* initialize semaphore */

	init_completion(&mdp_ppp_comp);

	init_MUTEX(&mdp_ppp_mutex);

	init_MUTEX(&mdp_pipe_ctrl_mutex);

	sema_init(&mdp_ppp_mutex, 1);

	sema_init(&mdp_pipe_ctrl_mutex, 1);



	dma2_data.busy = FALSE;

	dma2_data.waiting = FALSE;

	init_completion(&dma2_data.comp);

	init_MUTEX(&dma2_data.mutex);

	sema_init(&dma2_data.mutex, 1);

	mutex_init(&dma2_data.ov_mutex);



	dma3_data.busy = FALSE;

	dma3_data.waiting = FALSE;

	init_completion(&dma3_data.comp);

	init_MUTEX(&dma3_data.mutex);

	sema_init(&dma3_data.mutex, 1);



	dma_s_data.busy = FALSE;

	dma_s_data.waiting = FALSE;

	init_completion(&dma_s_data.comp);

	init_MUTEX(&dma_s_data.mutex);

	sema_init(&dma_s_data.mutex, 1);



	dma_e_data.busy = FALSE;

	dma_e_data.waiting = FALSE;