From 3f51ab859188631695afafa47b24c8e198a0d54d Mon Sep 17 00:00:00 2001 From: Komal Shah Date: Tue, 28 Mar 2006 06:51:26 -0800 Subject: [PATCH] [PATCH] ARM: OMAP: OMAP: FB: sem2mutex conversion sem2mutex conversion Signed-off-by: Komal Shah Signed-off-by: Tony Lindgren --- drivers/video/omap/omapfb_main.c | 6 +++--- include/asm-arm/arch-omap/omapfb.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index d32ba58ddd7..7e783790f39 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -111,12 +111,12 @@ extern struct lcd_ctrl_extif rfbi_extif; static void omapfb_rqueue_lock(struct omapfb_device *fbdev) { - down(&fbdev->rqueue_sema); + mutex_lock(&fbdev->rqueue_mutex); } static void omapfb_rqueue_unlock(struct omapfb_device *fbdev) { - up(&fbdev->rqueue_sema); + mutex_unlock(&fbdev->rqueue_mutex); } /* @@ -1273,7 +1273,7 @@ static int omapfb_do_probe(struct platform_device *pdev, struct lcd_panel *panel fbdev->panel = panel; platform_set_drvdata(pdev, fbdev); - init_MUTEX(&fbdev->rqueue_sema); + mutex_init(&fbdev->rqueue_mutex); #ifdef CONFIG_ARCH_OMAP1 fbdev->int_ctrl = &omap1_int_ctrl; diff --git a/include/asm-arm/arch-omap/omapfb.h b/include/asm-arm/arch-omap/omapfb.h index 7eade7be175..fccdb3db025 100644 --- a/include/asm-arm/arch-omap/omapfb.h +++ b/include/asm-arm/arch-omap/omapfb.h @@ -126,6 +126,7 @@ enum omapfb_update_mode { #include #include #include +#include #include @@ -269,7 +270,7 @@ struct omapfb_device { int state; int ext_lcdc; /* Using external LCD controller */ - struct semaphore rqueue_sema; + struct mutex rqueue_mutex; void *vram_virt_base; dma_addr_t vram_phys_base; -- 2.41.0