[media] soc_camera: remove the now obsolete struct soc_camera_ops

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
[g.liakhovetski@gmx.de: mt9m001 hunk moved to an earlier patch]
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/imx074.c b/drivers/media/video/imx074.c
index 20756e03dbb13fbaf5411721feaa9b433983dd02..3f5d4de8b91b9b5214f1d407b54cfe1756a2769f 100644 (file)
--- a/drivers/media/video/imx074.c
+++ b/drivers/media/video/imx074.c
@@ -437,7 +437,6 @@ static int imx074_probe(struct i2c_client *client,
 
        v4l2_i2c_subdev_init(&priv->subdev, client, &imx074_subdev_ops);
 
-       icd->ops        = NULL;
        priv->fmt       = &imx074_colour_fmts[0];
 
        ret = imx074_video_probe(icd, client);

diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c
index 25cdcb90768af0a1a8fe3d36e1f5ae19c89f2713..b8da7fe9a6bd5d4f4c430ca0531212b8c0cc86ff 100644 (file)
--- a/drivers/media/video/mt9t112.c
+++ b/drivers/media/video/mt9t112.c
@@ -1095,8 +1095,6 @@ static int mt9t112_probe(struct i2c_client *client,
 
        v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);
 
-       icd->ops = NULL;
-
        ret = mt9t112_camera_probe(icd, client);
        if (ret)
                kfree(priv);

diff --git a/drivers/media/video/ov5642.c b/drivers/media/video/ov5642.c
index b36d42bfeab23a8b0c4eda6227200c9b23bbc1e9..163a6f7ff8ef7a5673990f74ce788a5cf0600eab 100644 (file)
--- a/drivers/media/video/ov5642.c
+++ b/drivers/media/video/ov5642.c
@@ -942,7 +942,6 @@ static int ov5642_probe(struct i2c_client *client,
 
        v4l2_i2c_subdev_init(&priv->subdev, client, &ov5642_subdev_ops);
 
-       icd->ops        = NULL;
        priv->fmt       = &ov5642_colour_fmts[0];
 
        ret = ov5642_video_probe(icd, client);

diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c
index c8f6b188496dc7bcff99afaf317046526f4142d5..4402a8a74f7a727fc7dd87492a98b5c8ad426d7a 100644 (file)
--- a/drivers/media/video/soc_camera_platform.c
+++ b/drivers/media/video/soc_camera_platform.c
@@ -150,8 +150,6 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
        /* Set the control device reference */
        icd->control = &pdev->dev;
 
-       icd->ops = NULL;
-
        ici = to_soc_camera_host(icd->parent);
 
        v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);

diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 40cc1494b37762a311c6cdba2a205deb74812fab..2fddd1fbe529b95abde8af95314b1cc03d53f304 100644 (file)
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -921,7 +921,6 @@ static int tw9910_probe(struct i2c_client *client,
 
        v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops);
 
-       icd->ops     = NULL;
        icd->iface   = icl->bus_id;
 
        ret = tw9910_video_probe(icd, client);

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index d41b8bd7444536b50c5a7eb3fac92b6e1408c0b5..6398ff0f08abcfb0e1732bd21ac9acf1a02bbdfd 100644 (file)
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -39,7 +39,6 @@ struct soc_camera_device {
        unsigned char iface;            /* Host number */
        unsigned char devnum;           /* Device number per host */
        struct soc_camera_sense *sense; /* See comment in struct definition */
-       struct soc_camera_ops *ops;
        struct video_device *vdev;
        struct v4l2_ctrl_handler ctrl_handler;
        const struct soc_camera_format_xlate *current_fmt;
@@ -192,11 +191,6 @@ struct soc_camera_format_xlate {
        const struct soc_mbus_pixelfmt *host_fmt;
 };
 
-struct soc_camera_ops {
-       const struct v4l2_queryctrl *controls;
-       int num_controls;
-};
-
 #define SOCAM_SENSE_PCLK_CHANGED       (1 << 0)
 
 /**
@@ -223,18 +217,6 @@ struct soc_camera_sense {
        unsigned long pixel_clock;
 };
 
-static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
-       struct soc_camera_ops *ops, int id)
-{
-       int i;
-
-       for (i = 0; i < ops->num_controls; i++)
-               if (ops->controls[i].id == id)
-                       return &ops->controls[i];
-
-       return NULL;
-}
-
 #define SOCAM_DATAWIDTH(x)     BIT((x) - 1)
 #define SOCAM_DATAWIDTH_4      SOCAM_DATAWIDTH(4)
 #define SOCAM_DATAWIDTH_8      SOCAM_DATAWIDTH(8)