OSDN Git Service

[media] media/radio/saa7706h: Remove compat control ops
authorRicardo Ribalda <ricardo.ribalda@gmail.com>
Fri, 12 Jun 2015 16:31:18 +0000 (13:31 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 6 Jul 2015 11:25:56 +0000 (08:25 -0300)
They are no longer used in old non-control-framework
bridge drivers.

Reported-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/radio/saa7706h.c

index ec805b0..183e927 100644 (file)
@@ -336,19 +336,7 @@ static const struct v4l2_ctrl_ops saa7706h_ctrl_ops = {
        .s_ctrl = saa7706h_s_ctrl,
 };
 
-static const struct v4l2_subdev_core_ops saa7706h_core_ops = {
-       .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
-       .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
-       .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
-       .g_ctrl = v4l2_subdev_g_ctrl,
-       .s_ctrl = v4l2_subdev_s_ctrl,
-       .queryctrl = v4l2_subdev_queryctrl,
-       .querymenu = v4l2_subdev_querymenu,
-};
-
-static const struct v4l2_subdev_ops saa7706h_ops = {
-       .core = &saa7706h_core_ops,
-};
+static const struct v4l2_subdev_ops empty_ops = {};
 
 /*
  * Generic i2c probe
@@ -373,7 +361,7 @@ static int saa7706h_probe(struct i2c_client *client,
        if (state == NULL)
                return -ENOMEM;
        sd = &state->sd;
-       v4l2_i2c_subdev_init(sd, client, &saa7706h_ops);
+       v4l2_i2c_subdev_init(sd, client, &empty_ops);
 
        v4l2_ctrl_handler_init(&state->hdl, 4);
        v4l2_ctrl_new_std(&state->hdl, &saa7706h_ctrl_ops,