Merge branch 'clk-fixes' into clk-next

[deliverable/linux.git] / drivers / media / radio / saa7706h.c

diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index ec805b09c6086a8d79ce03d3229d8ebe7929e477..ba8e357ba0a2dc1d856f386e79a24eee0c85a3ef 100644 (file)
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -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,
@@ -429,7 +417,6 @@ MODULE_DEVICE_TABLE(i2c, saa7706h_id);
 
 static struct i2c_driver saa7706h_driver = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = DRIVER_NAME,
        },
        .probe          = saa7706h_probe,