aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-29 08:04:29 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:48 -0400
commita61389134c7c69a63ce779e40f6a052f7b3a17fd (patch)
tree9ae573f132d30815d1bfa2c950195ac2e1d7e8c4
parent4705e8c8508e4278a174855815b0fcd26fbc7e00 (diff)
V4L/DVB (11302): tda9875: remove legacy code for old-style i2c API
tda9875 is no longer used with the old-style i2c API, so I can remove the support for that. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/tda9875.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index e71b2bd46612..24e2b7d2ae58 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -28,20 +28,13 @@
28#include <linux/i2c.h> 28#include <linux/i2c.h>
29#include <linux/videodev2.h> 29#include <linux/videodev2.h>
30#include <media/v4l2-device.h> 30#include <media/v4l2-device.h>
31#include <media/v4l2-i2c-drv-legacy.h> 31#include <media/v4l2-i2c-drv.h>
32#include <media/i2c-addr.h> 32#include <media/i2c-addr.h>
33 33
34static int debug; /* insmod parameter */ 34static int debug; /* insmod parameter */
35module_param(debug, int, S_IRUGO | S_IWUSR); 35module_param(debug, int, S_IRUGO | S_IWUSR);
36MODULE_LICENSE("GPL"); 36MODULE_LICENSE("GPL");
37 37
38/* Addresses to scan */
39static unsigned short normal_i2c[] = {
40 I2C_ADDR_TDA9875 >> 1,
41 I2C_CLIENT_END
42};
43
44I2C_CLIENT_INSMOD;
45 38
46/* This is a superset of the TDA9875 */ 39/* This is a superset of the TDA9875 */
47struct tda9875 { 40struct tda9875 {
@@ -321,11 +314,6 @@ static int tda9875_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
321 return -EINVAL; 314 return -EINVAL;
322} 315}
323 316
324static int tda9875_command(struct i2c_client *client, unsigned cmd, void *arg)
325{
326 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
327}
328
329/* ----------------------------------------------------------------------- */ 317/* ----------------------------------------------------------------------- */
330 318
331static const struct v4l2_subdev_core_ops tda9875_core_ops = { 319static const struct v4l2_subdev_core_ops tda9875_core_ops = {
@@ -402,7 +390,6 @@ MODULE_DEVICE_TABLE(i2c, tda9875_id);
402 390
403static struct v4l2_i2c_driver_data v4l2_i2c_data = { 391static struct v4l2_i2c_driver_data v4l2_i2c_data = {
404 .name = "tda9875", 392 .name = "tda9875",
405 .command = tda9875_command,
406 .probe = tda9875_probe, 393 .probe = tda9875_probe,
407 .remove = tda9875_remove, 394 .remove = tda9875_remove,
408 .id_table = tda9875_id, 395 .id_table = tda9875_id,