[PATCH] ARM: OMAP: OMAP: FB: sem2mutex conversion

sem2mutex conversion

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index d32ba58ddd7041266173ae6548424bd1cb83de15..7e783790f396bea91602720e05cb225d26fc097e 100644 (file)
--- 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 7eade7be175e0d55b4cc3f74cf13a482d90a8961..fccdb3db025ff0dc79fd08dc4c5d7a0a27f0d1d3 100644 (file)
--- 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 <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/fb.h>
+#include <linux/mutex.h>
 
 #include <asm/arch/board.h>
 
@@ -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;