From c73f44d88782685c85b05bccd85040d8262f85e1 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 29 Mar 2009 17:34:31 -0300
Subject: [PATCH] --- yaml --- r: 142441 b: refs/heads/master c:
 762decd3bfb58f190b7cc2e9cc186ba95cca3dcf h: refs/heads/master i:   142439:
 de58027e603d5c60bb9ee915ae24342d0bf048f5 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/tvp5150.c | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index c5cdf8a4838f..2906365742b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef6078e98e40170a8a3d4e6b205184a2ede87a02
+refs/heads/master: 762decd3bfb58f190b7cc2e9cc186ba95cca3dcf
diff --git a/trunk/drivers/media/video/tvp5150.c b/trunk/drivers/media/video/tvp5150.c
index 3a5a95f134b4..d7f3bad2c02f 100644
--- a/trunk/drivers/media/video/tvp5150.c
+++ b/trunk/drivers/media/video/tvp5150.c
@@ -10,7 +10,7 @@
 #include <linux/delay.h>
 #include <media/v4l2-device.h>
 #include <media/tvp5150.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include <media/v4l2-chip-ident.h>
 
 #include "tvp5150_reg.h"
@@ -19,14 +19,6 @@ MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver");
 MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_LICENSE("GPL");
 
-/* standard i2c insmod options */
-static unsigned short normal_i2c[] = {
-	0xb8 >> 1,
-	0xba >> 1,
-	I2C_CLIENT_END
-};
-
-I2C_CLIENT_INSMOD;
 
 static int debug;
 module_param(debug, int, 0);
@@ -1026,11 +1018,6 @@ static int tvp5150_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
 	return -EINVAL;
 }
 
-static int tvp5150_command(struct i2c_client *client, unsigned cmd, void *arg)
-{
-	return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
-}
-
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_subdev_core_ops tvp5150_core_ops = {
@@ -1125,9 +1112,7 @@ MODULE_DEVICE_TABLE(i2c, tvp5150_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
 	.name = "tvp5150",
-	.command = tvp5150_command,
 	.probe = tvp5150_probe,
 	.remove = tvp5150_remove,
-	.legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
 	.id_table = tvp5150_id,
 };