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, 16 insertions, 15 deletions

diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index df831171e03c..44dea3211848 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -20,7 +20,8 @@
  *
  */
 
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
+
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -115,7 +116,7 @@ struct ttusb_dec {
         unsigned int                    out_pipe;
         unsigned int                    irq_pipe;
         enum ttusb_dec_interface        interface;
-        struct semaphore                usb_sem;
+        struct mutex                    usb_mutex;
 
         void                    *irq_buffer;
         struct urb              *irq_urb;
@@ -124,7 +125,7 @@ struct ttusb_dec {
         dma_addr_t              iso_dma_handle;
         struct urb              *iso_urb[ISO_BUF_COUNT];
         int                     iso_stream_count;
-        struct semaphore        iso_sem;
+        struct mutex            iso_mutex;
 
         u8                              packet[MAX_PVA_LENGTH + 4];
         enum ttusb_dec_packet_type      packet_type;
@@ -273,9 +274,9 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command,
         if (!b)
                 return -ENOMEM;
 
-        if ((result = down_interruptible(&dec->usb_sem))) {
+        if ((result = mutex_lock_interruptible(&dec->usb_mutex))) {
                 kfree(b);
-                printk("%s: Failed to down usb semaphore.\n", __FUNCTION__);
+                printk("%s: Failed to lock usb mutex.\n", __FUNCTION__);
                 return result;
         }
 
@@ -300,7 +301,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command,
         if (result) {
                 printk("%s: command bulk message failed: error %d\n",
                        __FUNCTION__, result);
-                up(&dec->usb_sem);
+                mutex_unlock(&dec->usb_mutex);
                 kfree(b);
                 return result;
         }
@@ -311,7 +312,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command,
         if (result) {
                 printk("%s: result bulk message failed: error %d\n",
                        __FUNCTION__, result);
-                up(&dec->usb_sem);
+                mutex_unlock(&dec->usb_mutex);
                 kfree(b);
                 return result;
         } else {
@@ -327,7 +328,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command,
                 if (cmd_result && b[3] > 0)
                         memcpy(cmd_result, &b[4], b[3]);
 
-                up(&dec->usb_sem);
+                mutex_unlock(&dec->usb_mutex);
 
                 kfree(b);
                 return 0;
@@ -835,7 +836,7 @@ static void ttusb_dec_stop_iso_xfer(struct ttusb_dec *dec)
 
         dprintk("%s\n", __FUNCTION__);
 
-        if (down_interruptible(&dec->iso_sem))
+        if (mutex_lock_interruptible(&dec->iso_mutex))
                 return;
 
         dec->iso_stream_count--;
@@ -845,7 +846,7 @@ static void ttusb_dec_stop_iso_xfer(struct ttusb_dec *dec)
                         usb_kill_urb(dec->iso_urb[i]);
         }
 
-        up(&dec->iso_sem);
+        mutex_unlock(&dec->iso_mutex);
 }
 
 /* Setting the interface of the DEC tends to take down the USB communications
@@ -890,7 +891,7 @@ static int ttusb_dec_start_iso_xfer(struct ttusb_dec *dec)
 
         dprintk("%s\n", __FUNCTION__);
 
-        if (down_interruptible(&dec->iso_sem))
+        if (mutex_lock_interruptible(&dec->iso_mutex))
                 return -EAGAIN;
 
         if (!dec->iso_stream_count) {
@@ -911,7 +912,7 @@ static int ttusb_dec_start_iso_xfer(struct ttusb_dec *dec)
                                         i--;
                                 }
 
-                                up(&dec->iso_sem);
+                                mutex_unlock(&dec->iso_mutex);
                                 return result;
                         }
                 }
@@ -919,7 +920,7 @@ static int ttusb_dec_start_iso_xfer(struct ttusb_dec *dec)
 
         dec->iso_stream_count++;
 
-        up(&dec->iso_sem);
+        mutex_unlock(&dec->iso_mutex);
 
         return 0;
 }
@@ -1229,8 +1230,8 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
 {
         dprintk("%s\n", __FUNCTION__);
 
-        sema_init(&dec->usb_sem, 1);
-        sema_init(&dec->iso_sem, 1);
+        mutex_init(&dec->usb_mutex);
+        mutex_init(&dec->iso_mutex);
 
         dec->command_pipe = usb_sndbulkpipe(dec->udev, COMMAND_PIPE);
         dec->result_pipe = usb_rcvbulkpipe(dec->udev, RESULT_PIPE);