diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-09-07 14:33:47 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-07 19:31:32 -0700 |
| commit | 0f0800f17a60816141f138a422477dc936262c42 (patch) | |
| tree | f21b866ac5d37d350c7754de2c3ade09be94e927 /drivers/staging/msm | |
| parent | d6835e8417554bfff40ba9603299f60de66fdf0a (diff) | |
staging: Bulk convert the semaphore mess
init_MUTEX(_LOCKED) and DECLARE_MUTEX are going away. Bulk convert
staging users.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/msm')
| -rw-r--r-- | drivers/staging/msm/mddihost.c | 2 | ||||
| -rw-r--r-- | drivers/staging/msm/mdp.c | 10 | ||||
| -rw-r--r-- | drivers/staging/msm/msm_fb.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/msm/mddihost.c b/drivers/staging/msm/mddihost.c index c6c1ee4eda0..58a86d5d995 100644 --- a/drivers/staging/msm/mddihost.c +++ b/drivers/staging/msm/mddihost.c @@ -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); diff --git a/drivers/staging/msm/mdp.c b/drivers/staging/msm/mdp.c index 36053afdebe..58cb4046293 100644 --- a/drivers/staging/msm/mdp.c +++ b/drivers/staging/msm/mdp.c @@ -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; diff --git a/drivers/staging/msm/msm_fb.c b/drivers/staging/msm/msm_fb.c index af5620e4eee..ea268edbf43 100644 --- a/drivers/staging/msm/msm_fb.c +++ b/drivers/staging/msm/msm_fb.c @@ -915,7 +915,7 @@ static int msm_fb_register(struct msm_fb_data_type *mfd) mfd->pan_waiting = FALSE; init_completion(&mfd->pan_comp); init_completion(&mfd->refresher_comp); - init_MUTEX(&mfd->sem); + sema_init(&mfd->sem, 1); fbram_offset = PAGE_ALIGN((int)fbram)-(int)fbram; fbram += fbram_offset; |