summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-07-28 14:42:21 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 18:27:55 -0200
commit716eba3ec1d8d89acd19617eb0bd85fc9b58497f (patch)
tree4ef77bdce41b7fd4571aa310d2f494815f6bb36c /drivers/media/video
parent5e891294f6dd7af617275477946e75d20c5e8136 (diff)
downloadop-kernel-dev-716eba3ec1d8d89acd19617eb0bd85fc9b58497f.zip
op-kernel-dev-716eba3ec1d8d89acd19617eb0bd85fc9b58497f.tar.gz
[media] V4L: imx074: remove superfluous soc-camera client operations
Now that all soc-camera hosts have been ported to use V4L2 subdevice mediabus-config operations and soc-camera client bus-parameter operations have been made optional, they can be removed. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/imx074.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/media/video/imx074.c b/drivers/media/video/imx074.c
index 63f17aa..20756e0 100644
--- a/drivers/media/video/imx074.c
+++ b/drivers/media/video/imx074.c
@@ -298,26 +298,6 @@ static struct v4l2_subdev_ops imx074_subdev_ops = {
.video = &imx074_subdev_video_ops,
};
-/*
- * We have to provide soc-camera operations, but we don't have anything to say
- * there. The MIPI CSI2 driver will provide .query_bus_param and .set_bus_param
- */
-static unsigned long imx074_query_bus_param(struct soc_camera_device *icd)
-{
- return 0;
-}
-
-static int imx074_set_bus_param(struct soc_camera_device *icd,
- unsigned long flags)
-{
- return -EINVAL;
-}
-
-static struct soc_camera_ops imx074_ops = {
- .query_bus_param = imx074_query_bus_param,
- .set_bus_param = imx074_set_bus_param,
-};
-
static int imx074_video_probe(struct soc_camera_device *icd,
struct i2c_client *client)
{
@@ -457,12 +437,11 @@ static int imx074_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&priv->subdev, client, &imx074_subdev_ops);
- icd->ops = &imx074_ops;
+ icd->ops = NULL;
priv->fmt = &imx074_colour_fmts[0];
ret = imx074_video_probe(icd, client);
if (ret < 0) {
- icd->ops = NULL;
kfree(priv);
return ret;
}
@@ -476,7 +455,6 @@ static int imx074_remove(struct i2c_client *client)
struct soc_camera_device *icd = client->dev.platform_data;
struct soc_camera_link *icl = to_soc_camera_link(icd);
- icd->ops = NULL;
if (icl->free_bus)
icl->free_bus(icl);
kfree(priv);
OpenPOWER on IntegriCloud