[PATCH] sem2mutex: sound/oss/

Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 9 insertions, 8 deletions

diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index faa0b7919b65..a1ec9d131ab3 100644
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -58,6 +58,7 @@ TODO:
 #include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/wait.h>
+#include <linux/mutex.h>
 
 #include <asm/dma.h>
 #include <asm/page.h>
@@ -326,7 +327,7 @@ typedef struct _rme96xx_info {
 
                 /* waiting and locking */
                 wait_queue_head_t wait;
-                struct semaphore  open_sem;
+                struct mutex  open_mutex;
                 wait_queue_head_t open_wait;
 
         } dma[RME96xx_MAX_DEVS]; 
@@ -842,7 +843,7 @@ static void busmaster_free(void* ptr,int size) {
 
 static int rme96xx_dmabuf_init(rme96xx_info * s,struct dmabuf* dma,int ioffset,int ooffset) {
 
-        init_MUTEX(&dma->open_sem);
+        mutex_init(&dma->open_mutex);
         init_waitqueue_head(&dma->open_wait);
         init_waitqueue_head(&dma->wait);
         dma->s = s; 
@@ -1469,21 +1470,21 @@ static int rme96xx_open(struct inode *in, struct file *f)
         dma = &s->dma[devnum];
         f->private_data = dma;
         /* wait for device to become free */
-        down(&dma->open_sem);
+        mutex_lock(&dma->open_mutex);
         while (dma->open_mode & f->f_mode) {
                 if (f->f_flags & O_NONBLOCK) {
-                        up(&dma->open_sem);
+                        mutex_unlock(&dma->open_mutex);
                         return -EBUSY;
                 }
                 add_wait_queue(&dma->open_wait, &wait);
                 __set_current_state(TASK_INTERRUPTIBLE);
-                up(&dma->open_sem);
+                mutex_unlock(&dma->open_mutex);
                 schedule();
                 remove_wait_queue(&dma->open_wait, &wait);
                 set_current_state(TASK_RUNNING);
                 if (signal_pending(current))
                         return -ERESTARTSYS;
-                down(&dma->open_sem);
+                mutex_lock(&dma->open_mutex);
         }
 
         COMM                ("hardware open")
@@ -1492,7 +1493,7 @@ static int rme96xx_open(struct inode *in, struct file *f)
 
         dma->open_mode |= (f->f_mode & (FMODE_READ | FMODE_WRITE));
         dma->opened = 1;
-        up(&dma->open_sem);
+        mutex_unlock(&dma->open_mutex);
 
         DBG(printk("device num %d open finished\n",devnum));
         return 0;
@@ -1524,7 +1525,7 @@ static int rme96xx_release(struct inode *in, struct file *file)
         }
 
         wake_up(&dma->open_wait);
-        up(&dma->open_sem);
+        mutex_unlock(&dma->open_mutex);
 
         return 0;
 }