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, 4 insertions, 3 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index fafd25fab835..3e2e12124bae 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -16,6 +16,7 @@
 #include <linux/dvb/ca.h>
 #include <linux/dvb/osd.h>
 #include <linux/dvb/net.h>
+#include <linux/mutex.h>
 
 #include "dvbdev.h"
 #include "demux.h"
@@ -127,7 +128,7 @@ struct av7110 {
         /* DEBI and polled command interface */
 
         spinlock_t              debilock;
-        struct semaphore        dcomlock;
+        struct mutex            dcomlock;
         volatile int            debitype;
         volatile int            debilen;
 
@@ -146,7 +147,7 @@ struct av7110 {
 
         int                     osdwin;      /* currently active window */
         u16                     osdbpp[8];
-        struct semaphore        osd_sema;
+        struct mutex            osd_mutex;
 
         /* CA */
 
@@ -172,7 +173,7 @@ struct av7110 {
         struct tasklet_struct   vpe_tasklet;
 
         int                     fe_synced;
-        struct semaphore        pid_mutex;
+        struct mutex            pid_mutex;
 
         int                     video_blank;
         struct video_status     videostate;