v4l-dvb: remove support for kernels < 2.6.16

From: Hans Verkuil <hverkuil@xs4all.nl>

Phase 4 removes the compatibility support for kernels < 2.6.16.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

5 files changed, 0 insertions, 30 deletions

diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.h b/linux/drivers/media/dvb/dvb-core/dmxdev.h
index bb416e6c2..7e8137d0b 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.h
@@ -31,9 +31,7 @@
 #include <linux/fs.h>
 #include <linux/string.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include <linux/dvb/dmx.h>
 
@@ -76,11 +74,7 @@ struct dmxdev_filter {
 	struct dmxdev *dev;
 	struct dvb_ringbuffer buffer;
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex mutex;
-#else
-	struct semaphore mutex;
-#endif
 
 	/* only for sections */
 	struct timer_list timer;
@@ -106,11 +100,7 @@ struct dmxdev {
 	struct dvb_ringbuffer dvr_buffer;
 #define DVR_BUFFER_SIZE (10*188*1024)
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex mutex;
-#else
-	struct semaphore mutex;
-#endif
 	spinlock_t lock;
 };
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.h b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
index 099b149e5..933397c24 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.h
@@ -27,9 +27,7 @@
 #include <linux/timer.h>
 #include <linux/spinlock.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "demux.h"
 
@@ -128,11 +126,7 @@ struct dvb_demux {
 	u8 tsbuf[204];
 	int tsbufp;
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex mutex;
-#else
-	struct semaphore mutex;
-#endif
 	spinlock_t lock;
 };
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
index fc3213fec..aa4133f0b 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -35,9 +35,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include <linux/dvb/frontend.h>
 
@@ -181,11 +179,7 @@ struct dvb_fe_events {
 	int			  eventr;
 	int			  overflow;
 	wait_queue_head_t	  wait_queue;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex		  mtx;
-#else
-	struct semaphore	  mtx;
-#endif
 };
 
 struct dvb_frontend {
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 2d2da4dff..3c0106f65 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -63,9 +63,7 @@
 #include <asm/uaccess.h>
 #include <linux/crc32.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "dvb_demux.h"
 #include "dvb_net.h"
@@ -161,11 +159,7 @@ struct dvb_net_priv {
 	unsigned char ule_bridged;		/* Whether the ULE_BRIDGED extension header was found. */
 	int ule_sndu_remain;			/* Nr. of bytes still required for current ULE SNDU. */
 	unsigned long ts_count;			/* Current ts cell counter. */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex mutex;
-#else
-	struct semaphore mutex;
-#endif
 };
 
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index 2da27de38..0ae0e5852 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -32,9 +32,7 @@
 #include <linux/fs.h>
 #include <linux/cdev.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include "dvbdev.h"
 
 static int dvbdev_debug;