From 4be7abb279a8388d97fa95b9e7a962c9954029b1 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 29 Mar 2009 09:04:29 -0300
Subject: [PATCH] --- yaml --- r: 138387 b: refs/heads/master c:
 a61389134c7c69a63ce779e40f6a052f7b3a17fd h: refs/heads/master i:   138385:
 189cdc051380c3e014ae09e0333ade1f7840de4a   138383:
 a89d5df08e3b4a778f0d34d1b2220e844e458da3 v: v3

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

diff --git a/[refs] b/[refs]
index f8742fc5d10f..dcebab396b55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4705e8c8508e4278a174855815b0fcd26fbc7e00
+refs/heads/master: a61389134c7c69a63ce779e40f6a052f7b3a17fd
diff --git a/trunk/drivers/media/video/tda9875.c b/trunk/drivers/media/video/tda9875.c
index e71b2bd46612..24e2b7d2ae58 100644
--- a/trunk/drivers/media/video/tda9875.c
+++ b/trunk/drivers/media/video/tda9875.c
@@ -28,20 +28,13 @@
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 #include <media/i2c-addr.h>
 
 static int debug; /* insmod parameter */
 module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_LICENSE("GPL");
 
-/* Addresses to scan */
-static unsigned short normal_i2c[] =  {
-    I2C_ADDR_TDA9875 >> 1,
-    I2C_CLIENT_END
-};
-
-I2C_CLIENT_INSMOD;
 
 /* This is a superset of the TDA9875 */
 struct tda9875 {
@@ -321,11 +314,6 @@ static int tda9875_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
 	return -EINVAL;
 }
 
-static int tda9875_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 tda9875_core_ops = {
@@ -402,7 +390,6 @@ MODULE_DEVICE_TABLE(i2c, tda9875_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
 	.name = "tda9875",
-	.command = tda9875_command,
 	.probe = tda9875_probe,
 	.remove = tda9875_remove,
 	.id_table = tda9875_id,