V4L/DVB (3318b): sem2mutex: drivers/media/, #2

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: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index 2ce010201308..dd830e0e5e96 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -46,6 +46,8 @@
 #include <linux/i2c.h>
 #include <linux/videotext.h>
 #include <linux/videodev.h>
+#include <linux/mutex.h>
+
 #include "saa5246a.h"
 
 MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
@@ -57,7 +59,7 @@ struct saa5246a_device
         u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];
         int    is_searching[NUM_DAUS];
         struct i2c_client *client;
-        struct semaphore lock;
+        struct mutex lock;
 };
 
 static struct video_device saa_template;        /* Declared near bottom */
@@ -90,7 +92,7 @@ static int saa5246a_attach(struct i2c_adapter *adap, int addr, int kind)
                 return -ENOMEM;
         }
         strlcpy(client->name, IF_NAME, I2C_NAME_SIZE);
-        init_MUTEX(&t->lock);
+        mutex_init(&t->lock);
 
         /*
          *      Now create a video4linux device
@@ -719,9 +721,9 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file,
         int err;
 
         cmd = vtx_fix_command(cmd);
-        down(&t->lock);
+        mutex_lock(&t->lock);
         err = video_usercopy(inode, file, cmd, arg, do_saa5246a_ioctl);
-        up(&t->lock);
+        mutex_unlock(&t->lock);
         return err;
 }