V4L/DVB (11304): v4l2: remove v4l2_subdev_command calls where they are no longer...

Several i2c drivers still used v4l2_subdev_command, even though they were
converted to v4l2_subdev. Remove those unused .command callbacks.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c
index 87e91072627ad934fec33920defb54fa05b1d64e..9714059ee9496746da94f813d45cd93b3d4d4947 100644 (file)
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
@@ -141,11 +141,6 @@ static int cs5345_log_status(struct v4l2_subdev *sd)
        return 0;
 }
 
-static int cs5345_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 cs5345_core_ops = {
@@ -214,8 +209,6 @@ MODULE_DEVICE_TABLE(i2c, cs5345_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "cs5345",
-       .driverid = I2C_DRIVERID_CS5345,
-       .command = cs5345_command,
        .probe = cs5345_probe,
        .remove = cs5345_remove,
        .id_table = cs5345_id,

diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index 41988072b973ba1a1fa43cefc0d7db1edbb0ccf2..1f340fefc49db00dba48961ffb8edaad711bef1c 100644 (file)
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -132,11 +132,6 @@ static int m52790_log_status(struct v4l2_subdev *sd)
        return 0;
 }
 
-static int m52790_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 m52790_core_ops = {
@@ -210,7 +205,6 @@ MODULE_DEVICE_TABLE(i2c, m52790_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "m52790",
-       .command = m52790_command,
        .probe = m52790_probe,
        .remove = m52790_remove,
        .id_table = m52790_id,

diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 21ec1dd2e1e5ff972bf77c87e3400624f8970a63..d573d84289988e0140cb08b7f40f0f7ef7b70b4b 100644 (file)
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -322,11 +322,6 @@ static long ovcamchip_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
        }
 }
 
-static int ovcamchip_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 ovcamchip_core_ops = {
@@ -394,7 +389,6 @@ MODULE_DEVICE_TABLE(i2c, ovcamchip_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "ovcamchip",
-       .command = ovcamchip_command,
        .probe = ovcamchip_probe,
        .remove = ovcamchip_remove,
        .id_table = ovcamchip_id,

diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c
index 5ad7a77699de7b115170b36bff2e87c65668f45f..25bf2303a6b5b2c0fc57ab10cef415087b7ba4c9 100644 (file)
--- a/drivers/media/video/saa717x.c
+++ b/drivers/media/video/saa717x.c
@@ -1380,11 +1380,6 @@ static int saa717x_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
        return 0;
 }
 
-static int saa717x_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 saa717x_core_ops = {
@@ -1528,9 +1523,7 @@ MODULE_DEVICE_TABLE(i2c, saa717x_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "saa717x",
-       .command = saa717x_command,
        .probe = saa717x_probe,
        .remove = saa717x_remove,
-       .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
        .id_table = saa717x_id,
 };

diff --git a/drivers/media/video/tlv320aic23b.c b/drivers/media/video/tlv320aic23b.c
index b8cc7d39a90ad800ab66d0426fc4a022314b3664..07789c64814cf4d133da0b83b84090a730c54721 100644 (file)
--- a/drivers/media/video/tlv320aic23b.c
+++ b/drivers/media/video/tlv320aic23b.c
@@ -118,11 +118,6 @@ static int tlv320aic23b_log_status(struct v4l2_subdev *sd)
        return 0;
 }
 
-static int tlv320aic23b_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 tlv320aic23b_core_ops = {
@@ -205,7 +200,6 @@ MODULE_DEVICE_TABLE(i2c, tlv320aic23b_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "tlv320aic23b",
-       .command = tlv320aic23b_command,
        .probe = tlv320aic23b_probe,
        .remove = tlv320aic23b_remove,
        .id_table = tlv320aic23b_id,

diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index 5b2c4399027c680db7f5f8a764eb4d502071efe4..c0ac651bb35844bd8d63d44b2c5b7526fba78ac3 100644 (file)
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -187,11 +187,6 @@ static int upd64031a_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register
 }
 #endif
 
-static int upd64031a_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 upd64031a_core_ops = {
@@ -267,7 +262,6 @@ MODULE_DEVICE_TABLE(i2c, upd64031a_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "upd64031a",
-       .command = upd64031a_command,
        .probe = upd64031a_probe,
        .remove = upd64031a_remove,
        .id_table = upd64031a_id,

diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index acd66c172efea85510a76122f456812207b762e8..410c915d51fa3e56e70122ae9d800b6d4430d910 100644 (file)
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -164,11 +164,6 @@ static int upd64083_log_status(struct v4l2_subdev *sd)
        return 0;
 }
 
-static int upd64083_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 upd64083_core_ops = {
@@ -239,7 +234,6 @@ MODULE_DEVICE_TABLE(i2c, upd64083_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "upd64083",
-       .command = upd64083_command,
        .probe = upd64083_probe,
        .remove = upd64083_remove,
        .id_table = upd64083_id,

diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c
index 9a590a91d7dea5d0764c0a3a1470c00782a89ec9..42e23a4fa60715cc129ec3b361f6c61966b17a97 100644 (file)
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
@@ -129,11 +129,6 @@ static int vp27smpx_log_status(struct v4l2_subdev *sd)
        return 0;
 }
 
-static int vp27smpx_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 vp27smpx_core_ops = {
@@ -206,7 +201,6 @@ MODULE_DEVICE_TABLE(i2c, vp27smpx_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "vp27smpx",
-       .command = vp27smpx_command,
        .probe = vp27smpx_probe,
        .remove = vp27smpx_remove,
        .id_table = vp27smpx_id,

diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c
index 18535c4a0549a11574c8a2920e8a5a913ef48149..b572ce288e14857d2e6f3f9fffe2675a5f111d89 100644 (file)
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
@@ -252,11 +252,6 @@ static int wm8739_log_status(struct v4l2_subdev *sd)
        return 0;
 }
 
-static int wm8739_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 wm8739_core_ops = {
@@ -343,7 +338,6 @@ MODULE_DEVICE_TABLE(i2c, wm8739_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "wm8739",
-       .command = wm8739_command,
        .probe = wm8739_probe,
        .remove = wm8739_remove,
        .id_table = wm8739_id,