diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 13:59:37 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 13:59:37 -0200 |
| commit | be80b76533c8db5af8ef3464c84d56c45767ed60 (patch) | |
| tree | 4ccb7c9d66f221a8c881332319523c91f10f683d /linux/drivers/media/dvb/ttpci/av7110.h | |
| parent | e2273bb85e79b09bafd264fda1832f9fbb4f4ff5 (diff) | |
| download | mediapointer-dvb-s2-be80b76533c8db5af8ef3464c84d56c45767ed60.tar.gz mediapointer-dvb-s2-be80b76533c8db5af8ef3464c84d56c45767ed60.tar.bz2 | |
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.
Kernel-sync from patch 3318b
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>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.h')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h index fafd25fab..51e8c3eca 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.h +++ b/linux/drivers/media/dvb/ttpci/av7110.h @@ -16,6 +16,10 @@ #include <linux/dvb/ca.h> #include <linux/dvb/osd.h> #include <linux/dvb/net.h> +#include "compat.h" +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +#include <linux/mutex.h> +#endif #include "dvbdev.h" #include "demux.h" @@ -32,6 +36,7 @@ #include "sp8870.h" #include "stv0297.h" #include "l64781.h" +#include "compat.h" #include <media/saa7146_vv.h> @@ -127,7 +132,11 @@ struct av7110 { /* DEBI and polled command interface */ spinlock_t debilock; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex dcomlock; +#else struct semaphore dcomlock; +#endif volatile int debitype; volatile int debilen; @@ -146,7 +155,11 @@ struct av7110 { int osdwin; /* currently active window */ u16 osdbpp[8]; - struct semaphore osd_sema; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex osd_mutex; +#else + struct semaphore osd_mutex; +#endif /* CA */ @@ -172,7 +185,11 @@ struct av7110 { struct tasklet_struct vpe_tasklet; int fe_synced; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex pid_mutex; +#else struct semaphore pid_mutex; +#endif int video_blank; struct video_status videostate; |