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>

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/dvb/b2c2/flexcop-common.h
index 7d7e1613c5a7..b3dd0603cd92 100644
--- a/drivers/media/dvb/b2c2/flexcop-common.h
+++ b/drivers/media/dvb/b2c2/flexcop-common.h
@@ -10,6 +10,7 @@
 
 #include <linux/config.h>
 #include <linux/pci.h>
+#include <linux/mutex.h>
 
 #include "flexcop-reg.h"
 
@@ -73,8 +74,7 @@ struct flexcop_device {
         int (*fe_sleep) (struct dvb_frontend *);
 
         struct i2c_adapter i2c_adap;
-        struct semaphore i2c_sem;
-
+        struct mutex i2c_mutex;
         struct module *owner;
 
         /* options and status */
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index 56495cb6cd02..e0bd2d8f0f0c 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -135,7 +135,7 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs
         struct flexcop_device *fc = i2c_get_adapdata(i2c_adap);
         int i, ret = 0;
 
-        if (down_interruptible(&fc->i2c_sem))
+        if (mutex_lock_interruptible(&fc->i2c_mutex))
                 return -ERESTARTSYS;
 
         /* reading */
@@ -161,7 +161,7 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs
         else
                 ret = num;
 
-        up(&fc->i2c_sem);
+        mutex_unlock(&fc->i2c_mutex);
 
         return ret;
 }
@@ -180,7 +180,7 @@ int flexcop_i2c_init(struct flexcop_device *fc)
 {
         int ret;
 
-        sema_init(&fc->i2c_sem,1);
+        mutex_init(&fc->i2c_mutex);
 
         memset(&fc->i2c_adap, 0, sizeof(struct i2c_adapter));
         strncpy(fc->i2c_adap.name, "B2C2 FlexCop device",I2C_NAME_SIZE);