Commit a0d1251d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

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

Several i2c drivers still used v4l2_subdev_command, even though they were
converted to v4l2_subdev. Remove those unused .command callbacks.
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 267ea2a9
...@@ -141,11 +141,6 @@ static int cs5345_log_status(struct v4l2_subdev *sd) ...@@ -141,11 +141,6 @@ static int cs5345_log_status(struct v4l2_subdev *sd)
return 0; 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 = { static const struct v4l2_subdev_core_ops cs5345_core_ops = {
...@@ -214,8 +209,6 @@ MODULE_DEVICE_TABLE(i2c, cs5345_id); ...@@ -214,8 +209,6 @@ MODULE_DEVICE_TABLE(i2c, cs5345_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "cs5345", .name = "cs5345",
.driverid = I2C_DRIVERID_CS5345,
.command = cs5345_command,
.probe = cs5345_probe, .probe = cs5345_probe,
.remove = cs5345_remove, .remove = cs5345_remove,
.id_table = cs5345_id, .id_table = cs5345_id,
......
...@@ -132,11 +132,6 @@ static int m52790_log_status(struct v4l2_subdev *sd) ...@@ -132,11 +132,6 @@ static int m52790_log_status(struct v4l2_subdev *sd)
return 0; 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 = { static const struct v4l2_subdev_core_ops m52790_core_ops = {
...@@ -210,7 +205,6 @@ MODULE_DEVICE_TABLE(i2c, m52790_id); ...@@ -210,7 +205,6 @@ MODULE_DEVICE_TABLE(i2c, m52790_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "m52790", .name = "m52790",
.command = m52790_command,
.probe = m52790_probe, .probe = m52790_probe,
.remove = m52790_remove, .remove = m52790_remove,
.id_table = m52790_id, .id_table = m52790_id,
......
...@@ -322,11 +322,6 @@ static long ovcamchip_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) ...@@ -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 = { static const struct v4l2_subdev_core_ops ovcamchip_core_ops = {
...@@ -394,7 +389,6 @@ MODULE_DEVICE_TABLE(i2c, ovcamchip_id); ...@@ -394,7 +389,6 @@ MODULE_DEVICE_TABLE(i2c, ovcamchip_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "ovcamchip", .name = "ovcamchip",
.command = ovcamchip_command,
.probe = ovcamchip_probe, .probe = ovcamchip_probe,
.remove = ovcamchip_remove, .remove = ovcamchip_remove,
.id_table = ovcamchip_id, .id_table = ovcamchip_id,
......
...@@ -1380,11 +1380,6 @@ static int saa717x_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) ...@@ -1380,11 +1380,6 @@ static int saa717x_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
return 0; 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 = { static const struct v4l2_subdev_core_ops saa717x_core_ops = {
...@@ -1528,9 +1523,7 @@ MODULE_DEVICE_TABLE(i2c, saa717x_id); ...@@ -1528,9 +1523,7 @@ MODULE_DEVICE_TABLE(i2c, saa717x_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "saa717x", .name = "saa717x",
.command = saa717x_command,
.probe = saa717x_probe, .probe = saa717x_probe,
.remove = saa717x_remove, .remove = saa717x_remove,
.legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
.id_table = saa717x_id, .id_table = saa717x_id,
}; };
...@@ -118,11 +118,6 @@ static int tlv320aic23b_log_status(struct v4l2_subdev *sd) ...@@ -118,11 +118,6 @@ static int tlv320aic23b_log_status(struct v4l2_subdev *sd)
return 0; 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 = { static const struct v4l2_subdev_core_ops tlv320aic23b_core_ops = {
...@@ -205,7 +200,6 @@ MODULE_DEVICE_TABLE(i2c, tlv320aic23b_id); ...@@ -205,7 +200,6 @@ MODULE_DEVICE_TABLE(i2c, tlv320aic23b_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "tlv320aic23b", .name = "tlv320aic23b",
.command = tlv320aic23b_command,
.probe = tlv320aic23b_probe, .probe = tlv320aic23b_probe,
.remove = tlv320aic23b_remove, .remove = tlv320aic23b_remove,
.id_table = tlv320aic23b_id, .id_table = tlv320aic23b_id,
......
...@@ -187,11 +187,6 @@ static int upd64031a_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register ...@@ -187,11 +187,6 @@ static int upd64031a_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register
} }
#endif #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 = { static const struct v4l2_subdev_core_ops upd64031a_core_ops = {
...@@ -267,7 +262,6 @@ MODULE_DEVICE_TABLE(i2c, upd64031a_id); ...@@ -267,7 +262,6 @@ MODULE_DEVICE_TABLE(i2c, upd64031a_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "upd64031a", .name = "upd64031a",
.command = upd64031a_command,
.probe = upd64031a_probe, .probe = upd64031a_probe,
.remove = upd64031a_remove, .remove = upd64031a_remove,
.id_table = upd64031a_id, .id_table = upd64031a_id,
......
...@@ -164,11 +164,6 @@ static int upd64083_log_status(struct v4l2_subdev *sd) ...@@ -164,11 +164,6 @@ static int upd64083_log_status(struct v4l2_subdev *sd)
return 0; 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 = { static const struct v4l2_subdev_core_ops upd64083_core_ops = {
...@@ -239,7 +234,6 @@ MODULE_DEVICE_TABLE(i2c, upd64083_id); ...@@ -239,7 +234,6 @@ MODULE_DEVICE_TABLE(i2c, upd64083_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "upd64083", .name = "upd64083",
.command = upd64083_command,
.probe = upd64083_probe, .probe = upd64083_probe,
.remove = upd64083_remove, .remove = upd64083_remove,
.id_table = upd64083_id, .id_table = upd64083_id,
......
...@@ -129,11 +129,6 @@ static int vp27smpx_log_status(struct v4l2_subdev *sd) ...@@ -129,11 +129,6 @@ static int vp27smpx_log_status(struct v4l2_subdev *sd)
return 0; 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 = { static const struct v4l2_subdev_core_ops vp27smpx_core_ops = {
...@@ -206,7 +201,6 @@ MODULE_DEVICE_TABLE(i2c, vp27smpx_id); ...@@ -206,7 +201,6 @@ MODULE_DEVICE_TABLE(i2c, vp27smpx_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "vp27smpx", .name = "vp27smpx",
.command = vp27smpx_command,
.probe = vp27smpx_probe, .probe = vp27smpx_probe,
.remove = vp27smpx_remove, .remove = vp27smpx_remove,
.id_table = vp27smpx_id, .id_table = vp27smpx_id,
......
...@@ -252,11 +252,6 @@ static int wm8739_log_status(struct v4l2_subdev *sd) ...@@ -252,11 +252,6 @@ static int wm8739_log_status(struct v4l2_subdev *sd)
return 0; 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 = { static const struct v4l2_subdev_core_ops wm8739_core_ops = {
...@@ -343,7 +338,6 @@ MODULE_DEVICE_TABLE(i2c, wm8739_id); ...@@ -343,7 +338,6 @@ MODULE_DEVICE_TABLE(i2c, wm8739_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "wm8739", .name = "wm8739",
.command = wm8739_command,
.probe = wm8739_probe, .probe = wm8739_probe,
.remove = wm8739_remove, .remove = wm8739_remove,
.id_table = wm8739_id, .id_table = wm8739_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment