Skip to content

Commit

Permalink
[media] V4L: ov5642: remove superfluous soc-camera client operations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Nov 3, 2011
1 parent 6c67056 commit ea04ddc
Showing 1 changed file with 1 addition and 23 deletions.
24 changes: 1 addition & 23 deletions drivers/media/video/ov5642.c
Original file line number Diff line number Diff line change
Expand Up @@ -889,26 +889,6 @@ static struct v4l2_subdev_ops ov5642_subdev_ops = {
.video = &ov5642_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 soc_ov5642_query_bus_param(struct soc_camera_device *icd)
{
return 0;
}

static int soc_ov5642_set_bus_param(struct soc_camera_device *icd,
unsigned long flags)
{
return -EINVAL;
}

static struct soc_camera_ops soc_ov5642_ops = {
.query_bus_param = soc_ov5642_query_bus_param,
.set_bus_param = soc_ov5642_set_bus_param,
};

static int ov5642_video_probe(struct soc_camera_device *icd,
struct i2c_client *client)
{
Expand Down Expand Up @@ -962,7 +942,7 @@ static int ov5642_probe(struct i2c_client *client,

v4l2_i2c_subdev_init(&priv->subdev, client, &ov5642_subdev_ops);

icd->ops = &soc_ov5642_ops;
icd->ops = NULL;
priv->fmt = &ov5642_colour_fmts[0];

ret = ov5642_video_probe(icd, client);
Expand All @@ -972,7 +952,6 @@ static int ov5642_probe(struct i2c_client *client,
return 0;

error:
icd->ops = NULL;
kfree(priv);
return ret;
}
Expand All @@ -983,7 +962,6 @@ static int ov5642_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);
Expand Down

0 comments on commit ea04ddc

Please sign in to comment.