aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-29 18:40:01 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:22 -0400
commit0c84674353a8c344d169aabce4dc4d44daaa270d (patch)
tree5250181fdb5ffd9912fb98760c98bbc9dde97e3b
parentf41737ece472cd803ffb24ac9f5d6fdd1d871341 (diff)
V4L/DVB (11371): v4l2: remove legacy fields in v4l2-i2c-drv.h.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/saa7115.c1
-rw-r--r--drivers/media/video/tuner-core.c2
-rw-r--r--include/media/v4l2-i2c-drv.h4
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index e6538eb3aa17..e8488430cdbd 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1667,6 +1667,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
1667 .name = "saa7115", 1667 .name = "saa7115",
1668 .probe = saa711x_probe, 1668 .probe = saa711x_probe,
1669 .remove = saa711x_remove, 1669 .remove = saa711x_remove,
1670 .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
1671 .id_table = saa7115_id, 1670 .id_table = saa7115_id,
1672}; 1671};
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 28af7b7e9512..cc5f018b8eb4 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1020,7 +1020,7 @@ static void tuner_lookup(struct i2c_adapter *adap,
1020 int mode_mask; 1020 int mode_mask;
1021 1021
1022 if (pos->i2c->adapter != adap || 1022 if (pos->i2c->adapter != adap ||
1023 pos->i2c->driver->id != I2C_DRIVERID_TUNER) 1023 strcmp(pos->i2c->driver->driver.name, "tuner"))
1024 continue; 1024 continue;
1025 1025
1026 mode_mask = pos->mode_mask & ~T_STANDBY; 1026 mode_mask = pos->mode_mask & ~T_STANDBY;
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index efdc8bf27f87..1ceeb9cfc8a8 100644
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -39,14 +39,11 @@
39 39
40struct v4l2_i2c_driver_data { 40struct v4l2_i2c_driver_data {
41 const char * const name; 41 const char * const name;
42 int driverid;
43 int (*command)(struct i2c_client *client, unsigned int cmd, void *arg); 42 int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
44 int (*probe)(struct i2c_client *client, const struct i2c_device_id *id); 43 int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
45 int (*remove)(struct i2c_client *client); 44 int (*remove)(struct i2c_client *client);
46 int (*suspend)(struct i2c_client *client, pm_message_t state); 45 int (*suspend)(struct i2c_client *client, pm_message_t state);
47 int (*resume)(struct i2c_client *client); 46 int (*resume)(struct i2c_client *client);
48 int (*legacy_probe)(struct i2c_adapter *adapter);
49 int legacy_class;
50 const struct i2c_device_id *id_table; 47 const struct i2c_device_id *id_table;
51}; 48};
52 49
@@ -59,7 +56,6 @@ static struct i2c_driver v4l2_i2c_driver;
59static int __init v4l2_i2c_drv_init(void) 56static int __init v4l2_i2c_drv_init(void)
60{ 57{
61 v4l2_i2c_driver.driver.name = v4l2_i2c_data.name; 58 v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
62 v4l2_i2c_driver.id = v4l2_i2c_data.driverid;
63 v4l2_i2c_driver.command = v4l2_i2c_data.command; 59 v4l2_i2c_driver.command = v4l2_i2c_data.command;
64 v4l2_i2c_driver.probe = v4l2_i2c_data.probe; 60 v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
65 v4l2_i2c_driver.remove = v4l2_i2c_data.remove; 61 v4l2_i2c_driver.remove = v4l2_i2c_data.remove;