aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-09-08 12:16:56 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:28:55 -0400
commit0934d94a52423fac35922c2e29d72a43db7ddd48 (patch)
tree9f5b80aebc386019ca710029566a5fe509fbff19 /drivers/media
parent41efcd7a6862951fd13c0e950ef05b865d7488a8 (diff)
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/imx074.c1
-rw-r--r--drivers/media/video/mt9t112.c2
-rw-r--r--drivers/media/video/ov5642.c1
-rw-r--r--drivers/media/video/soc_camera_platform.c2
-rw-r--r--drivers/media/video/tw9910.c1
5 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/video/imx074.c b/drivers/media/video/imx074.c
index 20756e03dbb1..3f5d4de8b91b 100644
--- a/drivers/media/video/imx074.c
+++ b/drivers/media/video/imx074.c
@@ -437,7 +437,6 @@ static int imx074_probe(struct i2c_client *client,
437 437
438 v4l2_i2c_subdev_init(&priv->subdev, client, &imx074_subdev_ops); 438 v4l2_i2c_subdev_init(&priv->subdev, client, &imx074_subdev_ops);
439 439
440 icd->ops = NULL;
441 priv->fmt = &imx074_colour_fmts[0]; 440 priv->fmt = &imx074_colour_fmts[0];
442 441
443 ret = imx074_video_probe(icd, client); 442 ret = imx074_video_probe(icd, client);
diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c
index 25cdcb90768a..b8da7fe9a6bd 100644
--- a/drivers/media/video/mt9t112.c
+++ b/drivers/media/video/mt9t112.c
@@ -1095,8 +1095,6 @@ static int mt9t112_probe(struct i2c_client *client,
1095 1095
1096 v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops); 1096 v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);
1097 1097
1098 icd->ops = NULL;
1099
1100 ret = mt9t112_camera_probe(icd, client); 1098 ret = mt9t112_camera_probe(icd, client);
1101 if (ret) 1099 if (ret)
1102 kfree(priv); 1100 kfree(priv);
diff --git a/drivers/media/video/ov5642.c b/drivers/media/video/ov5642.c
index b36d42bfeab2..163a6f7ff8ef 100644
--- a/drivers/media/video/ov5642.c
+++ b/drivers/media/video/ov5642.c
@@ -942,7 +942,6 @@ static int ov5642_probe(struct i2c_client *client,
942 942
943 v4l2_i2c_subdev_init(&priv->subdev, client, &ov5642_subdev_ops); 943 v4l2_i2c_subdev_init(&priv->subdev, client, &ov5642_subdev_ops);
944 944
945 icd->ops = NULL;
946 priv->fmt = &ov5642_colour_fmts[0]; 945 priv->fmt = &ov5642_colour_fmts[0];
947 946
948 ret = ov5642_video_probe(icd, client); 947 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 c8f6b188496d..4402a8a74f7a 100644
--- 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)
150 /* Set the control device reference */ 150 /* Set the control device reference */
151 icd->control = &pdev->dev; 151 icd->control = &pdev->dev;
152 152
153 icd->ops = NULL;
154
155 ici = to_soc_camera_host(icd->parent); 153 ici = to_soc_camera_host(icd->parent);
156 154
157 v4l2_subdev_init(&priv->subdev, &platform_subdev_ops); 155 v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 40cc1494b377..2fddd1fbe529 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -921,7 +921,6 @@ static int tw9910_probe(struct i2c_client *client,
921 921
922 v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops); 922 v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops);
923 923
924 icd->ops = NULL;
925 icd->iface = icl->bus_id; 924 icd->iface = icl->bus_id;
926 925
927 ret = tw9910_video_probe(icd, client); 926 ret = tw9910_video_probe(icd, client);