Skip to content

Commit

Permalink
[media] V4L: mt9t112: 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 0b01e03 commit ff51345
Showing 1 changed file with 2 additions and 46 deletions.
48 changes: 2 additions & 46 deletions drivers/media/video/mt9t112.c
Original file line number Diff line number Diff line change
Expand Up @@ -742,46 +742,6 @@ static int mt9t112_init_camera(const struct i2c_client *client)
return ret;
}

/************************************************************************
soc_camera_ops
************************************************************************/
static int mt9t112_set_bus_param(struct soc_camera_device *icd,
unsigned long flags)
{
struct soc_camera_link *icl = to_soc_camera_link(icd);
struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
struct mt9t112_priv *priv = to_mt9t112(client);

if (soc_camera_apply_sensor_flags(icl, flags) & SOCAM_PCLK_SAMPLE_RISING)
priv->flags |= PCLK_RISING;

return 0;
}

static unsigned long mt9t112_query_bus_param(struct soc_camera_device *icd)
{
struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
struct mt9t112_priv *priv = to_mt9t112(client);
struct soc_camera_link *icl = to_soc_camera_link(icd);
unsigned long flags = SOCAM_MASTER | SOCAM_VSYNC_ACTIVE_HIGH |
SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH;

flags |= (priv->info->flags & MT9T112_FLAG_PCLK_RISING_EDGE) ?
SOCAM_PCLK_SAMPLE_RISING : SOCAM_PCLK_SAMPLE_FALLING;

if (priv->info->flags & MT9T112_FLAG_DATAWIDTH_8)
flags |= SOCAM_DATAWIDTH_8;
else
flags |= SOCAM_DATAWIDTH_10;

return soc_camera_apply_sensor_flags(icl, flags);
}

static struct soc_camera_ops mt9t112_ops = {
.set_bus_param = mt9t112_set_bus_param,
.query_bus_param = mt9t112_query_bus_param,
};

/************************************************************************
v4l2_subdev_core_ops
************************************************************************/
Expand Down Expand Up @@ -1117,23 +1077,19 @@ static int mt9t112_probe(struct i2c_client *client,

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

icd->ops = &mt9t112_ops;
icd->ops = NULL;

ret = mt9t112_camera_probe(icd, client);
if (ret) {
icd->ops = NULL;
if (ret)
kfree(priv);
}

return ret;
}

static int mt9t112_remove(struct i2c_client *client)
{
struct mt9t112_priv *priv = to_mt9t112(client);
struct soc_camera_device *icd = client->dev.platform_data;

icd->ops = NULL;
kfree(priv);
return 0;
}
Expand Down

0 comments on commit ff51345

Please sign in to comment.