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>

37 files changed, 0 insertions, 226 deletions

diff --git a/linux/drivers/media/dvb/b2c2/flexcop-common.h b/linux/drivers/media/dvb/b2c2/flexcop-common.h
index 22fc0490d..166f0fb09 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-common.h
+++ b/linux/drivers/media/dvb/b2c2/flexcop-common.h
@@ -10,9 +10,7 @@
 
 #include <linux/pci.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "flexcop-reg.h"
 
@@ -84,11 +82,7 @@ struct flexcop_device {
 	int (*fe_sleep) (struct dvb_frontend *);
 
 	struct flexcop_i2c_adapter fc_i2c_adap[3];
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex i2c_mutex;
-#else
-	struct semaphore i2c_mutex;
-#endif
 	struct module *owner;
 
 	/* options and status */
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-usb.c b/linux/drivers/media/dvb/b2c2/flexcop-usb.c
index d523dd5bf..4be298e90 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -550,9 +550,6 @@ MODULE_DEVICE_TABLE (usb, flexcop_usb_table);
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver flexcop_usb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "b2c2_flexcop_usb",
 	.probe		= flexcop_usb_probe,
 	.disconnect = flexcop_usb_disconnect,
diff --git a/linux/drivers/media/dvb/bt8xx/bt878.h b/linux/drivers/media/dvb/bt8xx/bt878.h
index 9bef8bbdb..8319457f7 100644
--- a/linux/drivers/media/dvb/bt8xx/bt878.h
+++ b/linux/drivers/media/dvb/bt8xx/bt878.h
@@ -26,9 +26,7 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "bt848.h"
 #include "bttv.h"
@@ -107,11 +105,7 @@
 extern int bt878_num;
 
 struct bt878 {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex gpio_lock;
-#else
-	struct semaphore gpio_lock;
-#endif
 	unsigned int nr;
 	unsigned int bttv_nr;
 	struct i2c_adapter *adapter;
diff --git a/linux/drivers/media/dvb/bt8xx/dst_common.h b/linux/drivers/media/dvb/bt8xx/dst_common.h
index 47b62ef3c..40e6a88a9 100644
--- a/linux/drivers/media/dvb/bt8xx/dst_common.h
+++ b/linux/drivers/media/dvb/bt8xx/dst_common.h
@@ -25,9 +25,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/device.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include "bt878.h"
 
 #include "dst_ca.h"
@@ -140,11 +138,7 @@ struct dst_state {
 	u8 board_info[8];
 	u32 tuner_type;
 	char *tuner_name;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex dst_mutex;
-#else
-	struct semaphore dst_mutex;
-#endif
 	u8 fw_name[8];
 	struct dvb_device *dst_ca;
 };
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 27d092448..5fb213cf9 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -804,15 +804,8 @@ static int __devinit dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-static int dvb_bt8xx_probe(struct device *dev)
-#else
 static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)
-#endif
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	struct bttv_sub_device *sub = to_bttv_sub_dev(dev);
-#endif
 	struct dvb_bt8xx_card *card;
 	struct pci_dev* bttv_pci_dev;
 	int ret;
@@ -921,25 +914,13 @@ static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)
 		return ret;
 	}
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	dev_set_drvdata(dev, card);
-#else
 	dev_set_drvdata(&sub->dev, card);
-#endif
 	return 0;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-static int dvb_bt8xx_remove(struct device *dev)
-#else
 static void dvb_bt8xx_remove(struct bttv_sub_device *sub)
-#endif
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	struct dvb_bt8xx_card *card = dev_get_drvdata(dev);
-#else
 	struct dvb_bt8xx_card *card = dev_get_drvdata(&sub->dev);
-#endif
 
 	dprintk("dvb_bt8xx: unloading card%d\n", card->bttv_nr);
 
@@ -957,25 +938,12 @@ static void dvb_bt8xx_remove(struct bttv_sub_device *sub)
 	dvb_unregister_adapter(&card->dvb_adapter);
 
 	kfree(card);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-	return (0);
-#endif
 }
 
 static struct bttv_sub_driver driver = {
 	.drv = {
 		.name		= "dvb-bt8xx",
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-		.probe		= dvb_bt8xx_probe,
-		.remove		= dvb_bt8xx_remove,
-		/* FIXME:
-		 * .shutdown	= dvb_bt8xx_shutdown,
-		 * .suspend	= dvb_bt8xx_suspend,
-		 * .resume	= dvb_bt8xx_resume,
-		 */
-#endif
 	},
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	.probe		= dvb_bt8xx_probe,
 	.remove		= dvb_bt8xx_remove,
 	/* FIXME:
@@ -983,7 +951,6 @@ static struct bttv_sub_driver driver = {
 	 * .suspend	= dvb_bt8xx_suspend,
 	 * .resume	= dvb_bt8xx_resume,
 	 */
-#endif
 };
 
 static int __init dvb_bt8xx_init(void)
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index 6b4ed25c7..a87b3a417 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -27,9 +27,7 @@
 
 #include <linux/i2c.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include "dvbdev.h"
 #include "dvb_net.h"
 #include "bttv.h"
@@ -44,11 +42,7 @@
 #include "tuner-simple.h"
 
 struct dvb_bt8xx_card {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex lock;
-#else
-	struct semaphore lock;
-#endif
 	int nfeeds;
 	char card_name[32];
 	struct dvb_adapter dvb_adapter;
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
index e1d76b111..52f104d2b 100644
--- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -29,9 +29,7 @@
 #include <linux/input.h>
 #include <linux/dvb/frontend.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include <linux/mm.h>
 #include <asm/io.h>
 
@@ -63,15 +61,6 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-#define dprintk(level, args...)						\
-do {									\
-	if ((debug & level)) {						\
-		printk("%s: %s(): ", __stringify(KBUILD_MODNAME),	\
-		       __FUNCTION__);					\
-		printk(args); }						\
-} while (0)
-#else
 #define dprintk(level, args...)						\
 do {									\
 	if ((debug & level)) {						\
@@ -79,7 +68,6 @@ do {									\
 		       __func__);					\
 		printk(args); }						\
 } while (0)
-#endif
 
 enum cinergyt2_ep1_cmd {
 	CINERGYT2_EP1_PID_TABLE_RESET		= 0x01,
@@ -132,13 +120,8 @@ static struct dvb_frontend_info cinergyt2_fe_info = {
 struct cinergyt2 {
 	struct dvb_demux demux;
 	struct usb_device *udev;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex sem;
 	struct mutex wq_sem;
-#else
-	struct semaphore sem;
-	struct semaphore wq_sem;
-#endif
 	struct dvb_adapter adapter;
 	struct dvb_device *fedev;
 	struct dmxdev dmxdev;
@@ -896,11 +879,7 @@ static int cinergyt2_register_rc(struct cinergyt2 *cinergyt2)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 	input_dev->dev.parent = &cinergyt2->udev->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &cinergyt2->udev->dev;
-#else
-	input_dev->dev = &cinergyt2->udev->dev;
-#endif
 #endif
 
 	err = input_register_device(input_dev);
@@ -1141,9 +1120,6 @@ static const struct usb_device_id cinergyt2_table [] __devinitdata = {
 MODULE_DEVICE_TABLE(usb, cinergyt2_table);
 
 static struct usb_driver cinergyt2_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner	= THIS_MODULE,
-#endif
 	.name	= "cinergyT2",
 	.probe	= cinergyt2_probe,
 	.disconnect	= cinergyt2_disconnect,
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;
diff --git a/linux/drivers/media/dvb/dvb-usb/a800.c b/linux/drivers/media/dvb/dvb-usb/a800.c
index de7194ee7..dc8c8784c 100644
--- a/linux/drivers/media/dvb/dvb-usb/a800.c
+++ b/linux/drivers/media/dvb/dvb-usb/a800.c
@@ -164,9 +164,6 @@ static struct dvb_usb_device_properties a800_properties = {
 };
 
 static struct usb_driver a800_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_a800",
 	.probe		= a800_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/af9005.c b/linux/drivers/media/dvb/dvb-usb/af9005.c
index 04270dd3d..cfe71feef 100644
--- a/linux/drivers/media/dvb/dvb-usb/af9005.c
+++ b/linux/drivers/media/dvb/dvb-usb/af9005.c
@@ -1099,9 +1099,6 @@ static struct dvb_usb_device_properties af9005_properties = {
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver af9005_usb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner = THIS_MODULE,
-#endif
 	.name = "dvb_usb_af9005",
 	.probe = af9005_usb_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/anysee.c b/linux/drivers/media/dvb/dvb-usb/anysee.c
index 224919559..adfd4fc82 100644
--- a/linux/drivers/media/dvb/dvb-usb/anysee.c
+++ b/linux/drivers/media/dvb/dvb-usb/anysee.c
@@ -521,9 +521,6 @@ static struct dvb_usb_device_properties anysee_properties = {
 };
 
 static struct usb_driver anysee_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2, 6, 15)
-	.owner      = THIS_MODULE,
-#endif
 	.name       = "dvb_usb_anysee",
 	.probe      = anysee_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/au6610.c b/linux/drivers/media/dvb/dvb-usb/au6610.c
index fc3375c60..eb34cc389 100644
--- a/linux/drivers/media/dvb/dvb-usb/au6610.c
+++ b/linux/drivers/media/dvb/dvb-usb/au6610.c
@@ -225,9 +225,6 @@ static struct dvb_usb_device_properties au6610_properties = {
 };
 
 static struct usb_driver au6610_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2, 6, 15)
-	.owner      = THIS_MODULE,
-#endif
 	.name       = "dvb_usb_au6610",
 	.probe      = au6610_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/cxusb.c b/linux/drivers/media/dvb/dvb-usb/cxusb.c
index 843ff4769..9a3e97247 100644
--- a/linux/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/linux/drivers/media/dvb/dvb-usb/cxusb.c
@@ -1306,9 +1306,6 @@ static struct dvb_usb_device_properties cxusb_aver_a868r_properties = {
 };
 
 static struct usb_driver cxusb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_cxusb",
 	.probe		= cxusb_probe,
 	.disconnect     = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 2ac86685d..eeef50bff 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -436,9 +436,6 @@ static struct dvb_usb_device_properties artec_t1_usb2_properties = {
 };
 
 static struct usb_driver dibusb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_dibusb_mb",
 	.probe		= dibusb_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
index b1658ac6b..059cec955 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -124,9 +124,6 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
 };
 
 static struct usb_driver dibusb_mc_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_dibusb_mc",
 	.probe		= dibusb_mc_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/digitv.c b/linux/drivers/media/dvb/dvb-usb/digitv.c
index 1394b3e6b..b545cf3ea 100644
--- a/linux/drivers/media/dvb/dvb-usb/digitv.c
+++ b/linux/drivers/media/dvb/dvb-usb/digitv.c
@@ -330,9 +330,6 @@ static struct dvb_usb_device_properties digitv_properties = {
 };
 
 static struct usb_driver digitv_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_digitv",
 	.probe		= digitv_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/dtt200u.c b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
index 5fcae7925..81a6cbf60 100644
--- a/linux/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -334,9 +334,6 @@ static struct dvb_usb_device_properties wt220u_miglia_properties = {
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver dtt200u_usb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_dtt200u",
 	.probe		= dtt200u_usb_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index b2fae925a..ec95bdf90 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -125,10 +125,8 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 	input_dev->dev.parent = &d->udev->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &d->udev->dev;
 #endif
-#endif
 
 	/* set the bits for the keys */
 	deb_rc("key map size: %d\n", d->props.rc_key_map_size);
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
index f8528bf74..72503e2da 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -14,9 +14,7 @@
 #include <linux/usb.h>
 #include <linux/firmware.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "dvb_frontend.h"
 #include "dvb_demux.h"
@@ -354,18 +352,10 @@ struct dvb_usb_device {
 	int powered;
 
 	/* locking */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex usb_mutex;
-#else
-	struct semaphore usb_mutex;
-#endif
 
 	/* i2c */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex i2c_mutex;
-#else
-	struct semaphore i2c_mutex;
-#endif
 	struct i2c_adapter i2c_adap;
 
 	int                    num_adapters_initialized;
diff --git a/linux/drivers/media/dvb/dvb-usb/gl861.c b/linux/drivers/media/dvb/dvb-usb/gl861.c
index 36700b67d..6f596ed41 100644
--- a/linux/drivers/media/dvb/dvb-usb/gl861.c
+++ b/linux/drivers/media/dvb/dvb-usb/gl861.c
@@ -200,9 +200,6 @@ static struct dvb_usb_device_properties gl861_properties = {
 };
 
 static struct usb_driver gl861_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2, 6, 15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_gl861",
 	.probe		= gl861_probe,
 	.disconnect	= dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/gp8psk.c b/linux/drivers/media/dvb/dvb-usb/gp8psk.c
index 0a152fcb5..6eb8cc37f 100644
--- a/linux/drivers/media/dvb/dvb-usb/gp8psk.c
+++ b/linux/drivers/media/dvb/dvb-usb/gp8psk.c
@@ -279,9 +279,6 @@ static struct dvb_usb_device_properties gp8psk_properties = {
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver gp8psk_usb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_gp8psk",
 	.probe		= gp8psk_usb_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/m920x.c b/linux/drivers/media/dvb/dvb-usb/m920x.c
index 5a7766fab..54626a0db 100644
--- a/linux/drivers/media/dvb/dvb-usb/m920x.c
+++ b/linux/drivers/media/dvb/dvb-usb/m920x.c
@@ -894,9 +894,6 @@ static struct dvb_usb_device_properties dposh_properties = {
 };
 
 static struct usb_driver m920x_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_m920x",
 	.probe		= m920x_probe,
 	.disconnect	= dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index a346040ca..07fb843c7 100644
--- a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -214,9 +214,6 @@ static struct dvb_usb_device_properties nova_t_properties = {
 };
 
 static struct usb_driver nova_t_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_nova_t_usb2",
 	.probe		= nova_t_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/umt-010.c b/linux/drivers/media/dvb/dvb-usb/umt-010.c
index b6a3cbc44..118aab1a3 100644
--- a/linux/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/linux/drivers/media/dvb/dvb-usb/umt-010.c
@@ -135,9 +135,6 @@ static struct dvb_usb_device_properties umt_properties = {
 };
 
 static struct usb_driver umt_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_umt_010",
 	.probe		= umt_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/vp702x.c b/linux/drivers/media/dvb/dvb-usb/vp702x.c
index 9d286d430..c1db3271f 100644
--- a/linux/drivers/media/dvb/dvb-usb/vp702x.c
+++ b/linux/drivers/media/dvb/dvb-usb/vp702x.c
@@ -351,9 +351,6 @@ static struct dvb_usb_device_properties vp702x_properties = {
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver vp702x_usb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_vp702x",
 	.probe 		= vp702x_usb_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/dvb-usb/vp7045.c b/linux/drivers/media/dvb/dvb-usb/vp7045.c
index b45498911..8fc2ba02a 100644
--- a/linux/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/linux/drivers/media/dvb/dvb-usb/vp7045.c
@@ -288,9 +288,6 @@ static struct dvb_usb_device_properties vp7045_properties = {
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver vp7045_usb_driver = {
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "dvb_usb_vp7045",
 	.probe		= vp7045_usb_probe,
 	.disconnect = dvb_usb_device_exit,
diff --git a/linux/drivers/media/dvb/frontends/bcm3510.c b/linux/drivers/media/dvb/frontends/bcm3510.c
index ca9a55ae9..1cd63a4df 100644
--- a/linux/drivers/media/dvb/frontends/bcm3510.c
+++ b/linux/drivers/media/dvb/frontends/bcm3510.c
@@ -39,9 +39,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "dvb_frontend.h"
 #include "bcm3510.h"
@@ -54,11 +52,7 @@ struct bcm3510_state {
 	struct dvb_frontend frontend;
 
 	/* demodulator private data */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex hab_mutex;
-#else
-	struct semaphore hab_mutex;
-#endif
 	u8 firmware_loaded:1;
 
 	unsigned long next_status_check;
diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h
index 6cbf79c3e..61e4a7569 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.h
+++ b/linux/drivers/media/dvb/ttpci/av7110.h
@@ -14,9 +14,7 @@
 #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"
@@ -154,11 +152,7 @@ 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;
 
@@ -177,11 +171,7 @@ struct av7110 {
 
 	int			osdwin;      /* currently active window */
 	u16			osdbpp[8];
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex		osd_mutex;
-#else
-	struct semaphore	osd_mutex;
-#endif
 
 	/* CA */
 
@@ -206,11 +196,7 @@ 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;
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c
index 084164147..e0f9f760a 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c
@@ -358,11 +358,7 @@ int __devinit av7110_ir_init(struct av7110 *av7110)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 	input_dev->dev.parent = &av7110->dev->pci->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &av7110->dev->pci->dev;
-#else
-	input_dev->dev = &av7110->dev->pci->dev;
-#endif
 #endif
 	/* initial keymap */
 	memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map);
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index 8234c397c..f7388e5fc 100644
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
@@ -211,11 +211,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 	input_dev->dev.parent = &saa->pci->dev;
 #else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &saa->pci->dev;
-#else
-	input_dev->dev = &saa->pci->dev;
-#endif
 #endif
 
 	/* Select keymap and address */
diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h
index 0e8e596d6..6539c0171 100644
--- a/linux/drivers/media/dvb/ttpci/budget.h
+++ b/linux/drivers/media/dvb/ttpci/budget.h
@@ -12,9 +12,7 @@
 
 #include <linux/module.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include <media/saa7146.h>
 
@@ -24,13 +22,8 @@ extern int budget_debug;
 #undef dprintk
 #endif
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
-#define dprintk(level,args...) \
-	    do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __func__); printk(args); } } while (0)
-#else
 #define dprintk(level,args...) \
 	    do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __func__); printk(args); } } while (0)
-#endif
 
 struct budget_info {
 	char *name;
diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index fa84a6b49..8786d3d6f 100644
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -19,9 +19,7 @@
 #include <linux/errno.h>
 #include <linux/jiffies.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "dvb_frontend.h"
 #include "dmxdev.h"
@@ -87,13 +85,8 @@ struct ttusb {
 	struct dvb_net dvbnet;
 
 	/* and one for USB access. */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex semi2c;
 	struct mutex semusb;
-#else
-	struct semaphore semi2c;
-	struct semaphore semusb;
-#endif
 
 	struct dvb_adapter adapter;
 	struct usb_device *dev;
diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 052979dc9..8491913aa 100644
--- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -33,9 +33,7 @@
 #include <linux/input.h>
 
 #include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 
 #include "dmxdev.h"
 #include "dvb_demux.h"
@@ -120,11 +118,7 @@ struct ttusb_dec {
 	unsigned int			out_pipe;
 	unsigned int			irq_pipe;
 	enum ttusb_dec_interface	interface;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex			usb_mutex;
-#else
-	struct semaphore		usb_mutex;
-#endif
 
 	void			*irq_buffer;
 	struct urb		*irq_urb;
@@ -133,11 +127,7 @@ struct ttusb_dec {
 	dma_addr_t		iso_dma_handle;
 	struct urb		*iso_urb[ISO_BUF_COUNT];
 	int			iso_stream_count;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex		iso_mutex;
-#else
-	struct semaphore	iso_mutex;
-#endif
 
 	u8				packet[MAX_PVA_LENGTH + 4];
 	enum ttusb_dec_packet_type	packet_type;