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>

7 files changed, 25 insertions, 21 deletions

diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index 34c3189a1a3..d276ce6b366 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -344,7 +344,7 @@ bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet *
         int retval;
 
         retval = 0;
-        if (down_interruptible (&bt->gpio_lock))
+        if (mutex_lock_interruptible(&bt->gpio_lock))
                 return -ERESTARTSYS;
         /* special gpio signal */
         switch (cmd) {
@@ -375,7 +375,7 @@ bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet *
                 retval = -EINVAL;
                 break;
         }
-        up(&bt->gpio_lock);
+        mutex_unlock(&bt->gpio_lock);
         return retval;
 }
 
diff --git a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/dvb/bt8xx/bt878.h
index 9faf93770d0..f685bc12960 100644
--- a/drivers/media/dvb/bt8xx/bt878.h
+++ b/drivers/media/dvb/bt8xx/bt878.h
@@ -25,6 +25,8 @@
 #include <linux/pci.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
+#include <linux/mutex.h>
+
 #include "bt848.h"
 #include "bttv.h"
 
@@ -108,7 +110,7 @@ struct cards {
 extern int bt878_num;
 
 struct bt878 {
-        struct semaphore  gpio_lock;
+        struct mutex gpio_lock;
         unsigned int nr;
         unsigned int bttv_nr;
         struct i2c_adapter *adapter;
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 3a2ff1cc24b..d800df1212c 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -910,7 +910,7 @@ static int dst_get_device_id(struct dst_state *state)
 
 static int dst_probe(struct dst_state *state)
 {
-        sema_init(&state->dst_mutex, 1);
+        mutex_init(&state->dst_mutex);
         if ((rdc_8820_reset(state)) < 0) {
                 dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed.");
                 return -1;
@@ -962,7 +962,7 @@ int dst_command(struct dst_state *state, u8 *data, u8 len)
 {
         u8 reply;
 
-        down(&state->dst_mutex);
+        mutex_lock(&state->dst_mutex);
         if ((dst_comm_init(state)) < 0) {
                 dprintk(verbose, DST_NOTICE, 1, "DST Communication Initialization Failed.");
                 goto error;
@@ -1013,11 +1013,11 @@ int dst_command(struct dst_state *state, u8 *data, u8 len)
                 dprintk(verbose, DST_INFO, 1, "checksum failure");
                 goto error;
         }
-        up(&state->dst_mutex);
+        mutex_unlock(&state->dst_mutex);
         return 0;
 
 error:
-        up(&state->dst_mutex);
+        mutex_unlock(&state->dst_mutex);
         return -EIO;
 
 }
@@ -1128,7 +1128,7 @@ static int dst_write_tuna(struct dvb_frontend *fe)
                         dst_set_voltage(fe, SEC_VOLTAGE_13);
         }
         state->diseq_flags &= ~(HAS_LOCK | ATTEMPT_TUNE);
-        down(&state->dst_mutex);
+        mutex_lock(&state->dst_mutex);
         if ((dst_comm_init(state)) < 0) {
                 dprintk(verbose, DST_DEBUG, 1, "DST Communication initialization failed.");
                 goto error;
@@ -1160,11 +1160,11 @@ static int dst_write_tuna(struct dvb_frontend *fe)
         state->diseq_flags |= ATTEMPT_TUNE;
         retval = dst_get_tuna(state);
 werr:
-        up(&state->dst_mutex);
+        mutex_unlock(&state->dst_mutex);
         return retval;
 
 error:
-        up(&state->dst_mutex);
+        mutex_unlock(&state->dst_mutex);
         return -EIO;
 }
 
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index c650b4bf7f5..f6b49a801eb 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -81,7 +81,7 @@ static int dst_ci_command(struct dst_state* state, u8 * data, u8 *ca_string, u8
 {
         u8 reply;
 
-        down(&state->dst_mutex);
+        mutex_lock(&state->dst_mutex);
         dst_comm_init(state);
         msleep(65);
 
@@ -110,11 +110,11 @@ static int dst_ci_command(struct dst_state* state, u8 * data, u8 *ca_string, u8
                         goto error;
                 }
         }
-        up(&state->dst_mutex);
+        mutex_unlock(&state->dst_mutex);
         return 0;
 
 error:
-        up(&state->dst_mutex);
+        mutex_unlock(&state->dst_mutex);
         return -EIO;
 }
 
diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 81557f38fe3..51d4e043716 100644
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -25,6 +25,7 @@
 #include <linux/smp_lock.h>
 #include <linux/dvb/frontend.h>
 #include <linux/device.h>
+#include <linux/mutex.h>
 #include "bt878.h"
 
 #include "dst_ca.h"
@@ -121,7 +122,7 @@ struct dst_state {
         u8 vendor[8];
         u8 board_info[8];
 
-        struct semaphore dst_mutex;
+        struct mutex dst_mutex;
 };
 
 struct dst_types {
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index ea27b15007e..1649846f9ce 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -76,13 +76,13 @@ static int dvb_bt8xx_start_feed(struct dvb_demux_feed *dvbdmxfeed)
         if (!dvbdmx->dmx.frontend)
                 return -EINVAL;
 
-        down(&card->lock);
+        mutex_lock(&card->lock);
         card->nfeeds++;
         rc = card->nfeeds;
         if (card->nfeeds == 1)
                 bt878_start(card->bt, card->gpio_mode,
                             card->op_sync_orin, card->irq_err_ignore);
-        up(&card->lock);
+        mutex_unlock(&card->lock);
         return rc;
 }
 
@@ -96,11 +96,11 @@ static int dvb_bt8xx_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
         if (!dvbdmx->dmx.frontend)
                 return -EINVAL;
 
-        down(&card->lock);
+        mutex_lock(&card->lock);
         card->nfeeds--;
         if (card->nfeeds == 0)
                 bt878_stop(card->bt);
-        up(&card->lock);
+        mutex_unlock(&card->lock);
 
         return 0;
 }
@@ -788,7 +788,7 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
         if (!(card = kzalloc(sizeof(struct dvb_bt8xx_card), GFP_KERNEL)))
                 return -ENOMEM;
 
-        init_MUTEX(&card->lock);
+        mutex_init(&card->lock);
         card->bttv_nr = sub->core->nr;
         strncpy(card->card_name, sub->core->name, sizeof(sub->core->name));
         card->i2c_adapter = &sub->core->i2c_adap;
@@ -881,7 +881,7 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
                 return -EFAULT;
         }
 
-        init_MUTEX(&card->bt->gpio_lock);
+        mutex_init(&card->bt->gpio_lock);
         card->bt->bttv_nr = sub->core->nr;
 
         if ( (ret = dvb_bt8xx_load_card(card, sub->core->type)) ) {
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index cf035a80361..00dd9fa54c8 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -26,6 +26,7 @@
 #define DVB_BT8XX_H
 
 #include <linux/i2c.h>
+#include <linux/mutex.h>
 #include "dvbdev.h"
 #include "dvb_net.h"
 #include "bttv.h"
@@ -38,7 +39,7 @@
 #include "lgdt330x.h"
 
 struct dvb_bt8xx_card {
-        struct semaphore lock;
+        struct mutex lock;
         int nfeeds;
         char card_name[32];
         struct dvb_adapter dvb_adapter;