From e61d6fa683997c6cb6d1c12ea815aae0da5cf0a9 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 29 Mar 2009 19:40:01 -0300
Subject: [PATCH] --- yaml --- r: 142449 b: refs/heads/master c:
 0c84674353a8c344d169aabce4dc4d44daaa270d h: refs/heads/master i:   142447:
 6d90a182ca8e06b770e3b7b89ea0f110069c88c9 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/saa7115.c    | 1 -
 trunk/drivers/media/video/tuner-core.c | 2 +-
 trunk/include/media/v4l2-i2c-drv.h     | 4 ----
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f38514562c58..540434a31add 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f41737ece472cd803ffb24ac9f5d6fdd1d871341
+refs/heads/master: 0c84674353a8c344d169aabce4dc4d44daaa270d
diff --git a/trunk/drivers/media/video/saa7115.c b/trunk/drivers/media/video/saa7115.c
index e6538eb3aa17..e8488430cdbd 100644
--- a/trunk/drivers/media/video/saa7115.c
+++ b/trunk/drivers/media/video/saa7115.c
@@ -1667,6 +1667,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
 	.name = "saa7115",
 	.probe = saa711x_probe,
 	.remove = saa711x_remove,
-	.legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
 	.id_table = saa7115_id,
 };
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index 28af7b7e9512..cc5f018b8eb4 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -1020,7 +1020,7 @@ static void tuner_lookup(struct i2c_adapter *adap,
 		int mode_mask;
 
 		if (pos->i2c->adapter != adap ||
-		    pos->i2c->driver->id != I2C_DRIVERID_TUNER)
+		    strcmp(pos->i2c->driver->driver.name, "tuner"))
 			continue;
 
 		mode_mask = pos->mode_mask & ~T_STANDBY;
diff --git a/trunk/include/media/v4l2-i2c-drv.h b/trunk/include/media/v4l2-i2c-drv.h
index efdc8bf27f87..1ceeb9cfc8a8 100644
--- a/trunk/include/media/v4l2-i2c-drv.h
+++ b/trunk/include/media/v4l2-i2c-drv.h
@@ -39,14 +39,11 @@
 
 struct v4l2_i2c_driver_data {
 	const char * const name;
-	int driverid;
 	int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
 	int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
 	int (*remove)(struct i2c_client *client);
 	int (*suspend)(struct i2c_client *client, pm_message_t state);
 	int (*resume)(struct i2c_client *client);
-	int (*legacy_probe)(struct i2c_adapter *adapter);
-	int legacy_class;
 	const struct i2c_device_id *id_table;
 };
 
@@ -59,7 +56,6 @@ static struct i2c_driver v4l2_i2c_driver;
 static int __init v4l2_i2c_drv_init(void)
 {
 	v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-	v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
 	v4l2_i2c_driver.command = v4l2_i2c_data.command;
 	v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
 	v4l2_i2c_driver.remove = v4l2_i2c_data.remove;