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>

7 files changed, 1 insertions, 85 deletions

diff --git a/linux/drivers/media/video/bt8xx/bt832.c b/linux/drivers/media/video/bt8xx/bt832.c
index 4eefaba8f..fc884c935 100644
--- a/linux/drivers/media/video/bt8xx/bt832.c
+++ b/linux/drivers/media/video/bt8xx/bt832.c
@@ -33,9 +33,6 @@
 #include <linux/slab.h>
 #include <media/v4l2-common.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#endif
 #include "bttv.h"
 #include "bt832.h"
 
@@ -50,11 +47,7 @@ static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 int debug;    /* debug output */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 module_param(debug,            int, 0644);
-#else
-MODULE_PARM(debug,            "i");
-#endif
 
 /* ---------------------------------------------------------------------- */
 
@@ -187,12 +180,7 @@ int bt832_init(struct i2c_client *i2c_client_s)
 
 
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
-#else
-static int bt832_attach(struct i2c_adapter *adap, int addr,
-			  unsigned short flags, int kind)
-#endif
 {
 	struct bt832 *t;
 
@@ -207,10 +195,6 @@ static int bt832_attach(struct i2c_adapter *adap, int addr,
 
 	v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1);
 
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	MOD_INC_USE_COUNT;
-#endif
 	if(! bt832_init(&t->client)) {
 		bt832_detach(&t->client);
 		return -1;
@@ -238,9 +222,6 @@ static int bt832_detach(struct i2c_client *client)
 	v4l_info(&t->client,"dettach\n");
 	i2c_detach_client(client);
 	kfree(t);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-	MOD_DEC_USE_COUNT;
-#endif
 	return 0;
 }
 
@@ -277,7 +258,7 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
 	.owner          = THIS_MODULE,
 #endif
 #if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c
index 0e6771643..10a519642 100644
--- a/linux/drivers/media/video/bt8xx/bttv-cards.c
+++ b/linux/drivers/media/video/bt8xx/bttv-cards.c
@@ -115,14 +115,6 @@ module_param(gpiomask,   int, 0444);
 module_param(audioall,   int, 0444);
 module_param(autoload,   int, 0444);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM(card,"1-" __stringify(BTTV_MAX) "i");
-MODULE_PARM(pll,"1-" __stringify(BTTV_MAX) "i");
-MODULE_PARM(tuner,"1-" __stringify(BTTV_MAX) "i");
-MODULE_PARM(svhs,"1-" __stringify(BTTV_MAX) "i");
-MODULE_PARM(remote,"1-" __stringify(BTTV_MAX) "i");
-MODULE_PARM(audiomux,"1-" __stringify(BTTV_MAX) "i");
-#else
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
 static int dummy;
 module_param_array(card,     int, dummy, 0444);
@@ -139,7 +131,6 @@ module_param_array(svhs,     int, NULL, 0444);
 module_param_array(remote,   int, NULL, 0444);
 module_param_array(audiomux, int, NULL, 0444);
 #endif
-#endif
 
 MODULE_PARM_DESC(triton1,"set ETBF pci config bit "
 		 "[enable bug compatibility for triton1 + others]");
@@ -3870,11 +3861,7 @@ static int __devinit pvr_boot(struct bttv *btv)
 	const struct firmware *fw_entry;
 	int rc;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	rc = request_firmware(&fw_entry, "hcwamc.rbf", &btv->c.pci->dev);
-#else
-	rc = request_firmware(&fw_entry, "hcwamc.rbf", pci_name(btv->c.pci));
-#endif
 	if (rc != 0) {
 		printk(KERN_WARNING "bttv%d: no altera firmware [via hotplug]\n",
 		       btv->c.nr);
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c
index 15f10b88a..33db080bb 100644
--- a/linux/drivers/media/video/bt8xx/bttv-driver.c
+++ b/linux/drivers/media/video/bt8xx/bttv-driver.c
@@ -48,9 +48,7 @@
 #include <media/tvaudio.h>
 #include <media/msp3400.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/dma-mapping.h>
-#endif
 
 #include <asm/io.h>
 #include <asm/byteorder.h>
@@ -132,16 +130,12 @@ module_param(uv_ratio,          int, 0444);
 module_param(full_luma_range,   int, 0444);
 module_param(coring,            int, 0444);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-MODULE_PARM(radio,"1-" __stringify(BTTV_MAX) "i");
-#else
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
 static int dummy;
 module_param_array(radio, int, dummy, 0444);
 #else
 module_param_array(radio, int, NULL, 0444);
 #endif
-#endif
 
 MODULE_PARM_DESC(radio,"The TV card supports radio, default is 0 (no)");
 MODULE_PARM_DESC(bigendian,"byte order of the framebuffer, default is native endian");
@@ -171,7 +165,6 @@ MODULE_LICENSE("GPL");
 /* ----------------------------------------------------------------------- */
 /* sysfs                                                                   */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
 static ssize_t show_card(struct device *cd,
 			 struct device_attribute *attr, char *buf)
@@ -184,7 +177,6 @@ static ssize_t show_card(struct class_device *cd, char *buf)
 	return sprintf(buf, "%d\n", btv ? btv->c.type : UNSET);
 }
 static DEVICE_ATTR(card, S_IRUGO, show_card, NULL);
-#endif
 
 /* ----------------------------------------------------------------------- */
 /* dvb auto-load setup                                                     */
@@ -198,9 +190,6 @@ static void request_module_async(struct work_struct *work)
 	request_module("dvb-bt8xx");
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define request_modules(dev)
-#else
 static void request_modules(struct bttv *dev)
 {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
@@ -210,7 +199,6 @@ static void request_modules(struct bttv *dev)
 #endif
 	schedule_work(&dev->request_module_wk);
 }
-#endif
 #else
 #define request_modules(dev)
 #endif /* CONFIG_MODULES */
@@ -4115,10 +4103,8 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
 
 	btv=(struct bttv *)dev_id;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	if (btv->custom_irq)
 		handled = btv->custom_irq(btv);
-#endif
 
 	count=0;
 	while (1) {
@@ -4156,9 +4142,7 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
 
 		if ((astat & BT848_INT_GPINT) && btv->remote) {
 			wake_up(&btv->gpioq);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 			bttv_input_irq(btv);
-#endif
 		}
 
 		if (astat & BT848_INT_I2CDONE) {
@@ -4238,10 +4222,8 @@ static struct video_device *vdev_init(struct bttv *btv,
 		return NULL;
 	*vfd = *template;
 	vfd->minor   = -1;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 	vfd->dev     = &btv->c.pci->dev;
 	vfd->release = video_device_release;
-#endif
 	vfd->type    = type;
 	vfd->debug   = bttv_debug;
 	snprintf(vfd->name, sizeof(vfd->name), "BT%d%s %s (%s)",
@@ -4509,13 +4491,11 @@ static int __devinit bttv_probe(struct pci_dev *dev,
 		disclaim_video_lines(btv);
 	}
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	/* add subdevices and autoload dvb-bt8xx if needed */
 	if (bttv_tvcards[btv->c.type].has_dvb) {
 		bttv_sub_add_device(&btv->c, "dvb");
 		request_modules(btv);
 	}
-#endif
 
 	bttv_input_init(btv);
 
@@ -4554,9 +4534,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
 	btv->shutdown=1;
 	wake_up(&btv->gpioq);
 	bttv_input_fini(btv);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	bttv_sub_del_devices(&btv->c);
-#endif
 
 	/* unregister i2c_bus + input */
 	fini_bttv_i2c(btv);
@@ -4722,13 +4700,11 @@ static int __init bttv_init_module(void)
 
 	bttv_check_chipset();
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	ret = bus_register(&bttv_sub_bus_type);
 	if (ret < 0) {
 		printk(KERN_WARNING "bttv: bus_register error: %d\n", ret);
 		return ret;
 	}
-#endif
 	ret = pci_register_driver(&bttv_pci_driver);
 	if (ret < 0)
 		bus_unregister(&bttv_sub_bus_type);
@@ -4739,9 +4715,7 @@ static int __init bttv_init_module(void)
 static void __exit bttv_cleanup_module(void)
 {
 	pci_unregister_driver(&bttv_pci_driver);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	bus_unregister(&bttv_sub_bus_type);
-#endif
 }
 
 module_init(bttv_init_module);
diff --git a/linux/drivers/media/video/bt8xx/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c
index 746b9dd77..e0c52aa27 100644
--- a/linux/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c
@@ -33,9 +33,7 @@
 
 #include "bttvp.h"
 #include <media/v4l2-common.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/jiffies.h>
-#endif
 #include <asm/io.h>
 
 static int attach_inform(struct i2c_client *client);
@@ -428,9 +426,7 @@ int __devinit init_bttv_i2c(struct bttv *btv)
 #endif
 	btv->c.i2c_adap.client_register = attach_inform;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,66)
 	btv->c.i2c_adap.dev.parent = &btv->c.pci->dev;
-#endif
 	snprintf(btv->c.i2c_adap.name, sizeof(btv->c.i2c_adap.name),
 		 "bt%d #%d [%s]", btv->id, btv->c.nr,
 		 btv->use_i2c_hw ? "hw" : "sw");
diff --git a/linux/drivers/media/video/bt8xx/bttv-input.c b/linux/drivers/media/video/bt8xx/bttv-input.c
index f82213990..ada104826 100644
--- a/linux/drivers/media/video/bt8xx/bttv-input.c
+++ b/linux/drivers/media/video/bt8xx/bttv-input.c
@@ -313,7 +313,6 @@ int bttv_input_init(struct bttv *btv)
 
 	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;
@@ -333,7 +332,6 @@ int bttv_input_init(struct bttv *btv)
 	input_dev->dev = &btv->c.pci->dev;
 #endif
 #endif
-#endif
 
 	btv->remote = ir;
 	bttv_ir_start(btv, ir);
diff --git a/linux/drivers/media/video/bt8xx/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h
index 4c73aacdb..dab61e62e 100644
--- a/linux/drivers/media/video/bt8xx/bttv.h
+++ b/linux/drivers/media/video/bt8xx/bttv.h
@@ -302,8 +302,6 @@ extern int bttv_write_gpio(unsigned int card,
 /* ---------------------------------------------------------- */
 /* sysfs/driver-moded based gpio access interface             */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-
 struct bttv_sub_device {
 	struct device    dev;
 	struct bttv_core *core;
@@ -335,14 +333,6 @@ void bttv_gpio_bits(struct bttv_core *core, u32 mask, u32 bits);
 #define gpio_write(value)      bttv_gpio_write(&btv->c, value)
 #define gpio_bits(mask,bits)   bttv_gpio_bits(&btv->c, mask, bits)
 
-#else
-
-#define gpio_inout(mask,bits)  btaor((mask)&(bits),~(mask),BT848_GPIO_OUT_EN)
-#define gpio_read()            btread(BT848_GPIO_DATA)
-#define gpio_write(value)      btwrite((value),BT848_GPIO_DATA)
-#define gpio_bits(mask,bits)   btaor((mask)&(bits),~(mask),BT848_GPIO_DATA)
-
-#endif
 
 /* ---------------------------------------------------------- */
 /* i2c                                                        */
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h
index 9fd8eeddf..96679f533 100644
--- a/linux/drivers/media/video/bt8xx/bttvp.h
+++ b/linux/drivers/media/video/bt8xx/bttvp.h
@@ -42,13 +42,7 @@
 #include <asm/io.h>
 #include "compat.h"
 #include <media/v4l2-common.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include "i2c-compat.h"
-#define strlcpy(dest,src,len) strncpy(dest,src,(len)-1)
-#else
 #include <linux/device.h>
-#endif
 #include <media/videobuf-dma-sg.h>
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
@@ -272,14 +266,10 @@ extern struct videobuf_queue_ops bttv_vbi_qops;
 /* ---------------------------------------------------------- */
 /* bttv-gpio.c */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-
 extern struct bus_type bttv_sub_bus_type;
 int bttv_sub_add_device(struct bttv_core *core, char *name);
 int bttv_sub_del_devices(struct bttv_core *core);
 
-#endif
-
 /* ---------------------------------------------------------- */
 /* bttv-driver.c                                              */