diff options
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 | ||||
-rw-r--r-- | drivers/staging/msm/staging-devices.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/msm/mddihost.c b/drivers/staging/msm/mddihost.c index c6c1ee4e..58a86d5 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 36053af..58cb404 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 af5620e..ea268ed 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; diff --git a/drivers/staging/msm/staging-devices.c b/drivers/staging/msm/staging-devices.c index 861f330..d6cd919 100644 --- a/drivers/staging/msm/staging-devices.c +++ b/drivers/staging/msm/staging-devices.c @@ -166,7 +166,7 @@ static void __init qsd8x50_allocate_memory_regions(void) msm_fb_resources[0].start = __pa(addr); msm_fb_resources[0].end = msm_fb_resources[0].start + size - 1; - pr_info(KERN_ERR "using %lu bytes of SMI at %lx physical for fb\n", + pr_info("using %lu bytes of SMI at %lx physical for fb\n", size, (unsigned long)addr); } |