Skip to contentSkip to conversation

sa1100fb: Convert ctrlr_sem in a mutex

PATCH New Matthias Kaehlcke 1 participant 1 message May 5, 2008 Framebuffer layer

lore
Share & tools
lore

Matthias Kaehlcke

author
#0 lore raw

PATCH 1/1 sa1100fb: Convert ctrlr_sem in a mutex

sa1100fb: The semaphore ctrlr_sem is used as a mutex. Convert it to the mutex API

Signed-off-by Matthias Kaehlcke <[email protected]>

--

drivers/video/sa1100fb.c +4 -3
index ab2b211..2dd1b8a 100644
@@ -174,6 +174,7 @@
 #include <linux/cpufreq.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/mutex.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>

@@ -1107,7 +1108,7 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
 {
 	u_int old_state;
 
-	down(&fbi->ctrlr_sem);
+	mutex_lock(&fbi->ctrlr_lock);
 
 	old_state = fbi->state;
 

@@ -1192,7 +1193,7 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
 		}
 		break;
 	}
-	up(&fbi->ctrlr_sem);
+	mutex_unlock(&fbi->ctrlr_lock);
 }
 
 /*

@@ -1444,7 +1445,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
 
 	init_waitqueue_head(&fbi->ctrlr_wait);
 	INIT_WORK(&fbi->task, sa1100fb_task);
-	init_MUTEX(&fbi->ctrlr_sem);
+	mutex_init(&fbi->ctrlr_lock);
 
 	return fbi;
 }
drivers/video/sa1100fb.h +1 -1
index f465b27..86831db 100644
@@ -100,7 +100,7 @@ struct sa1100fb_info {
 
 	volatile u_char		state;
 	volatile u_char		task_state;
-	struct semaphore	ctrlr_sem;
+	struct mutex		ctrlr_lock;
 	wait_queue_head_t	ctrlr_wait;
 	struct work_struct	task;
Signature · 10 lines
Matthias Kaehlcke
Embedded Linux Engineer
Barcelona

            Nothing is more despicable than respect based on fear
                              (Albert Camus)
                                                                 .''`.
    using free software / Debian GNU/Linux | http://debian.org  : :'  :
                                                                `. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4                  `-