1 files changed, 3 insertions, 41 deletions

diff --git a/v4l_experimental/v3tv/vpx3224.c b/v4l_experimental/v3tv/vpx3224.c
index fb5f05b79..50c60ca53 100644
--- a/v4l_experimental/v3tv/vpx3224.c
+++ b/v4l_experimental/v3tv/vpx3224.c
@@ -45,9 +45,6 @@
 
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#include "i2c-compat.h"
-#endif
 
 #include <linux/videodev.h>
 #include <linux/video_decoder.h>
@@ -67,11 +64,9 @@ static int
 vpx3224_write_fp_block(struct i2c_client *client,
 		       const u16 * data, int len);
 #endif
+
 static int vpx3224_detect_client(struct i2c_adapter *adapter, int address,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-				 unsigned short flags,
-#endif
-				 int kind);
+		int kind);
 
 /* Each client has this additional data */
 
@@ -606,12 +601,6 @@ vpx3224_write_fp_block(struct i2c_client *client,
 	return res;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#if defined (CONFIG_V3TV_VERBOSEDEBUG) & defined (CONFIG_PROC_FS)
-#include "vpx3224-proc.c"
-#endif
-#endif
-
 /* ----------------------------------------------------------------------
  * Client procedures */
 
@@ -1078,13 +1067,8 @@ static int vpx3224_attach_adapter(struct i2c_adapter *adapter)
 {
 	int res = 0;
 
-#ifdef I2C_ADAP_CLASS_TV_ANALOG
-	if (adapter->class & I2C_ADAP_CLASS_TV_ANALOG)
-		res = i2c_probe(adapter, &addr_data, vpx3224_detect_client);
-#else
-	if (adapter->id & (I2C_HW_SMBUS_VOODOO3))
+	if (adapter->class & I2C_CLASS_TV_ANALOG)
 		res = i2c_probe(adapter, &addr_data, vpx3224_detect_client);
-#endif
 	DEB2(printk(KERN_INFO "%s: i2c_probe of adapter: %s returned %d\n",
 		    THIS_MODULE->name, adapter->name, res));
 
@@ -1097,11 +1081,6 @@ static int vpx3224_detach_client(struct i2c_client *client)
 	struct vpx3224 *decoder = i2c_get_clientdata(client);
 
 	int res;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#if defined (CONFIG_PROC_FS) && defined (CONFIG_V3TV_VERBOSEDEBUG)
-	vpx3224_del_proc(client);
-#endif
-#endif
 
 	res = i2c_detach_client(client);
 	DEB2(printk(KERN_INFO "%s: i2c_detach_client returned %d\n",
@@ -1111,11 +1090,7 @@ static int vpx3224_detach_client(struct i2c_client *client)
 		       THIS_MODULE->name, client->name);
 		return res;
 	}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-//        MOD_DEC_USE_COUNT;
-#else
 	module_put(client->adapter->owner);
-#endif
 	kfree(decoder);
 	kfree(client);
 	vpx3224_i2c_id--;
@@ -1144,9 +1119,6 @@ static struct i2c_driver vpx3224_i2c_driver = {
 /* vpx3224_detect_client - aka: i2c_client_found_addr_proc *found_proc
  * so called by i2c_probe, res passed back to vpx3224_attach_adapter */
 static int vpx3224_detect_client(struct i2c_adapter *adapter, int address,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-				 unsigned short flags,
-#endif
 				 int kind)
 {
 	int res;
@@ -1230,17 +1202,7 @@ static int vpx3224_detect_client(struct i2c_adapter *adapter, int address,
 	printk(KERN_INFO "%s: %s client found at address 0x%x\n",
 	       THIS_MODULE->name, client->name, client->addr);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#if defined (CONFIG_PROC_FS) && defined (CONFIG_V3TV_VERBOSEDEBUG)
-	vpx3224_init_proc(client);
-#endif
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-//        MOD_INC_USE_COUNT;
-#else
 	try_module_get(client->adapter->owner);
-#endif
 	return vpx3224_i2c_id;
 }