From e9314ad63401c89bffe82b165eb7ae630c05a75d Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 8 Jul 2008 17:40:58 +0200
Subject: 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>
---
 linux/drivers/media/video/usbvision/usbvision-i2c.c   |  5 -----
 linux/drivers/media/video/usbvision/usbvision-video.c | 12 ------------
 linux/drivers/media/video/usbvision/usbvision.h       |  6 ------
 3 files changed, 23 deletions(-)

(limited to 'linux/drivers/media/video/usbvision')

diff --git a/linux/drivers/media/video/usbvision/usbvision-i2c.c b/linux/drivers/media/video/usbvision/usbvision-i2c.c
index 1b6180573..9d2f6b985 100644
--- a/linux/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/linux/drivers/media/video/usbvision/usbvision-i2c.c
@@ -29,9 +29,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
 #include <linux/utsname.h>
-#endif
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <linux/ioport.h>
@@ -521,9 +519,6 @@ static struct i2c_adapter i2c_adap_template = {
 
 static struct i2c_client i2c_client_template = {
 	.name		= "usbvision internal",
-#if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
-	.flags = I2C_CLIENT_ALLOW_USE,
-#endif
 };
 
 /*
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c
index 073d30454..cd6c41d67 100644
--- a/linux/drivers/media/video/usbvision/usbvision-video.c
+++ b/linux/drivers/media/video/usbvision/usbvision-video.c
@@ -1625,19 +1625,10 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
 {
 	struct usb_usbvision *usbvision;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
-	if ((usbvision = kmalloc(sizeof(struct usb_usbvision), GFP_KERNEL)) ==
-	    NULL) {
-		goto err_exit;
-	}
-
-	memset(usbvision, 0, sizeof(struct usb_usbvision));
-#else
 	if ((usbvision = kzalloc(sizeof(struct usb_usbvision), GFP_KERNEL)) ==
 	    NULL) {
 		goto err_exit;
 	}
-#endif
 
 	usbvision->dev = dev;
 
@@ -1900,9 +1891,6 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf)
 }
 
 static struct usb_driver usbvision_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-	.owner		= THIS_MODULE,
-#endif
 	.name		= "usbvision",
 	.id_table	= usbvision_table,
 	.probe		= usbvision_probe,
diff --git a/linux/drivers/media/video/usbvision/usbvision.h b/linux/drivers/media/video/usbvision/usbvision.h
index 371c6987f..590ff1e19 100644
--- a/linux/drivers/media/video/usbvision/usbvision.h
+++ b/linux/drivers/media/video/usbvision/usbvision.h
@@ -34,9 +34,7 @@
 #include <linux/list.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 #include <linux/mutex.h>
-#endif
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 #include <linux/videodev2.h>
@@ -395,11 +393,7 @@ struct usb_usbvision {
 	unsigned char iface;						/* Video interface number */
 	unsigned char ifaceAlt;			/* Alt settings */
 	unsigned char Vin_Reg2_Preset;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
 	struct mutex               lock;
-#else
-	struct semaphore           lock;
-#endif
 	struct timer_list powerOffTimer;
 	struct work_struct powerOffWork;
 	int power;							/* is the device powered on? */
-- 
cgit v1.2.3