diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 16:34:31 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:17 -0400 |
commit | 762decd3bfb58f190b7cc2e9cc186ba95cca3dcf (patch) | |
tree | d9fae641c1cb778cb3d5ef2f86c642d941a8bea8 /drivers/media | |
parent | ef6078e98e40170a8a3d4e6b205184a2ede87a02 (diff) |
V4L/DVB (11363): tvp5150: remove i2c legacy code.
All drivers that use tvp5150 now use v4l2_subdev, so we can remove the
legacy code from tvp5150.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/tvp5150.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 3a5a95f134b4..d7f3bad2c02f 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
11 | #include <media/v4l2-device.h> | 11 | #include <media/v4l2-device.h> |
12 | #include <media/tvp5150.h> | 12 | #include <media/tvp5150.h> |
13 | #include <media/v4l2-i2c-drv-legacy.h> | 13 | #include <media/v4l2-i2c-drv.h> |
14 | #include <media/v4l2-chip-ident.h> | 14 | #include <media/v4l2-chip-ident.h> |
15 | 15 | ||
16 | #include "tvp5150_reg.h" | 16 | #include "tvp5150_reg.h" |
@@ -19,14 +19,6 @@ MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver"); | |||
19 | MODULE_AUTHOR("Mauro Carvalho Chehab"); | 19 | MODULE_AUTHOR("Mauro Carvalho Chehab"); |
20 | MODULE_LICENSE("GPL"); | 20 | MODULE_LICENSE("GPL"); |
21 | 21 | ||
22 | /* standard i2c insmod options */ | ||
23 | static unsigned short normal_i2c[] = { | ||
24 | 0xb8 >> 1, | ||
25 | 0xba >> 1, | ||
26 | I2C_CLIENT_END | ||
27 | }; | ||
28 | |||
29 | I2C_CLIENT_INSMOD; | ||
30 | 22 | ||
31 | static int debug; | 23 | static int debug; |
32 | module_param(debug, int, 0); | 24 | module_param(debug, int, 0); |
@@ -1026,11 +1018,6 @@ static int tvp5150_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) | |||
1026 | return -EINVAL; | 1018 | return -EINVAL; |
1027 | } | 1019 | } |
1028 | 1020 | ||
1029 | static int tvp5150_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
1030 | { | ||
1031 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
1032 | } | ||
1033 | |||
1034 | /* ----------------------------------------------------------------------- */ | 1021 | /* ----------------------------------------------------------------------- */ |
1035 | 1022 | ||
1036 | static const struct v4l2_subdev_core_ops tvp5150_core_ops = { | 1023 | static const struct v4l2_subdev_core_ops tvp5150_core_ops = { |
@@ -1125,9 +1112,7 @@ MODULE_DEVICE_TABLE(i2c, tvp5150_id); | |||
1125 | 1112 | ||
1126 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 1113 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
1127 | .name = "tvp5150", | 1114 | .name = "tvp5150", |
1128 | .command = tvp5150_command, | ||
1129 | .probe = tvp5150_probe, | 1115 | .probe = tvp5150_probe, |
1130 | .remove = tvp5150_remove, | 1116 | .remove = tvp5150_remove, |
1131 | .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL, | ||
1132 | .id_table = tvp5150_id, | 1117 | .id_table = tvp5150_id, |
1133 | }; | 1118 | }; |