v4l-dvb: remove support for kernels < 2.6.0

From: Hans Verkuil <hverkuil@xs4all.nl>

First phase of the backwards compatibility cleanup: stop supporting kernels
older than 2.6.0.

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

9 files changed, 0 insertions, 62 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c
index a642d3dc8..83638557d 100644
--- a/linux/drivers/media/video/cx88/cx88-blackbird.c
+++ b/linux/drivers/media/video/cx88/cx88-blackbird.c
@@ -30,9 +30,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/delay.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #include <linux/device.h>
-#endif
 #include <linux/firmware.h>
 #include <media/v4l2-common.h>
 #include <media/cx2341x.h>
@@ -444,13 +442,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
 	if (retval < 0)
 		dprintk(0, "Error with register_write\n");
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME,
 				  &dev->pci->dev);
-#else
-	retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME,
-				  pci_name(dev->pci));
-#endif
 
 
 	if (retval != 0) {
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 1fb39e08e..e8932ddf1 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -33,11 +33,6 @@ static unsigned int tuner[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 static unsigned int radio[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 static unsigned int card[]  = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM(tuner,"1-" __stringify(CX88_MAXBOARDS) "i");
-MODULE_PARM(radiox,"1-" __stringify(CX88_MAXBOARDS) "i");
-MODULE_PARM(card,"1-" __stringify(CX88_MAXBOARDS) "i");
-#else
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
 static int dummy;
 module_param_array(tuner, int, dummy, 0444);
@@ -48,7 +43,6 @@ module_param_array(tuner, int, NULL, 0444);
 module_param_array(radio, int, NULL, 0444);
 module_param_array(card,  int, NULL, 0444);
 #endif
-#endif
 
 MODULE_PARM_DESC(tuner,"tuner type");
 MODULE_PARM_DESC(radio,"radio tuner type");
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index 5d6265c1d..6efb1c61a 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1037,10 +1037,8 @@ struct video_device *cx88_vdev_init(struct cx88_core *core,
 		return NULL;
 	*vfd = *template;
 	vfd->minor   = -1;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 	vfd->dev     = &pci->dev;
 	vfd->release = video_device_release;
-#endif
 	snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
 		 core->name, type, core->board.name);
 	return vfd;
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c
index 800ea0d64..0f8ca620b 100644
--- a/linux/drivers/media/video/cx88/cx88-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-i2c.c
@@ -34,9 +34,6 @@
 
 #include "cx88.h"
 #include <media/v4l2-common.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 
 static unsigned int i2c_debug;
 module_param(i2c_debug, int, 0644);
@@ -196,13 +193,9 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
 		core->i2c_adap.class |= I2C_CLASS_TV_DIGITAL;
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,66)
 	core->i2c_adap.dev.parent = &pci->dev;
-#endif
 	strlcpy(core->i2c_adap.name,core->name,sizeof(core->i2c_adap.name));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	core->i2c_adap.owner = THIS_MODULE;
-#endif
 	core->i2c_adap.id = I2C_HW_B_CX2388x;
 	core->i2c_adap.client_register = attach_inform;
 	core->i2c_adap.client_unregister = detach_inform;
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c
index e334bd20a..4796e3ba1 100644
--- a/linux/drivers/media/video/cx88/cx88-input.c
+++ b/linux/drivers/media/video/cx88/cx88-input.c
@@ -349,7 +349,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
 
 	ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
 	input_dev->name = ir->name;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 	input_dev->phys = ir->phys;
 	input_dev->id.bustype = BUS_PCI;
 	input_dev->id.version = 1;
@@ -369,7 +368,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
 	input_dev->dev = &pci->dev;
 #endif
 #endif
-#endif
 	/* record handles to ourself */
 	ir->core = core;
 	core->ir = ir;
@@ -500,11 +498,9 @@ void cx88_ir_irq(struct cx88_core *core)
 
 /* ---------------------------------------------------------------------- */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe");
 MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls");
 MODULE_LICENSE("GPL");
-#endif
 /*
  * Local variables:
  * c-basic-offset: 8
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c
index c8dba3dfa..b95f6804f 100644
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c
@@ -24,9 +24,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 #include <linux/device.h>
-#endif
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <asm/delay.h>
@@ -36,13 +34,9 @@
 /* ------------------------------------------------------------------ */
 
 MODULE_DESCRIPTION("mpeg driver for cx2388x based TV cards");
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
-#else
-MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>,Chris Pascoe <c.pascoe@itee.uq.edu.au>,Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
-#endif
 MODULE_LICENSE("GPL");
 
 static unsigned int debug;
@@ -72,9 +66,6 @@ static void request_module_async(struct work_struct *work)
 		request_module("cx88-blackbird");
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define request_modules(dev)
-#else
 static void request_modules(struct cx8802_dev *dev)
 {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
@@ -84,7 +75,6 @@ static void request_modules(struct cx8802_dev *dev)
 #endif
 	schedule_work(&dev->request_module_wk);
 }
-#endif
 #else
 #define request_modules(dev)
 #endif /* CONFIG_MODULES */
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c
index b4dab2647..5eb95dbbe 100644
--- a/linux/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c
@@ -53,9 +53,7 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/kthread.h>
-#endif
 
 #include "cx88.h"
 
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index c9f7d0048..786800e1a 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -35,9 +35,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include "compat.h"
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #include <linux/kthread.h>
-#endif
 #include <asm/div64.h>
 
 #include "cx88.h"
@@ -58,11 +56,6 @@ static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 static unsigned int vbi_nr[]   = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM(video_nr,"1-" __stringify(CX88_MAXBOARDS) "i");
-MODULE_PARM(vbi_nr,"1-" __stringify(CX88_MAXBOARDS) "i");
-MODULE_PARM(radio_nr,"1-" __stringify(CX88_MAXBOARDS) "i");
-#else
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
 static unsigned int dummy;
 module_param_array(video_nr, int, dummy, 0444);
@@ -73,7 +66,6 @@ module_param_array(video_nr, int, NULL, 0444);
 module_param_array(vbi_nr,   int, NULL, 0444);
 module_param_array(radio_nr, int, NULL, 0444);
 #endif
-#endif
 
 MODULE_PARM_DESC(video_nr,"video device numbers");
 MODULE_PARM_DESC(vbi_nr,"vbi device numbers");
@@ -2221,7 +2213,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 	mutex_unlock(&core->lock);
 
 	/* start tvaudio thread */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 	if (core->board.tuner_type != TUNER_ABSENT) {
 		core->kthread = kthread_run(cx88_audio_thread, core, "cx88 tvaudio");
 		if (IS_ERR(core->kthread)) {
@@ -2230,13 +2221,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 			       core->name, err);
 		}
 	}
-#else
-	/*FIXME: Not sure if this will work */
-	if (core->board.tuner_type != TUNER_ABSENT)
-		kernel_thread (cx88_audio_thread, core, 0);
-
-	core->kthread = NULL;
-#endif
 	return 0;
 
 fail_unreg:
diff --git a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
index 84bb59175..4dbe81282 100644
--- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
+++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c
@@ -30,10 +30,6 @@
 #include "cx88.h"
 #include "cx88-vp3054-i2c.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
-
 MODULE_DESCRIPTION("driver for cx2388x VP3054 design");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
 MODULE_LICENSE("GPL");
@@ -128,14 +124,10 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
 	vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,66)
 	vp3054_i2c->adap.dev.parent = &dev->pci->dev;
-#endif
 	strlcpy(vp3054_i2c->adap.name, core->name,
 		sizeof(vp3054_i2c->adap.name));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	vp3054_i2c->adap.owner = THIS_MODULE;
-#endif
 	vp3054_i2c->adap.id = I2C_HW_B_CX2388x;
 	vp3054_i2c->algo.data = dev;
 	i2c_set_adapdata(&vp3054_i2c->adap, dev);