Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db669e79 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: ov6650: 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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ea04ddce

drivers/media/video/ov6650.c

+2 −48
Original line number Diff line number Diff line
@@ -419,52 +419,6 @@ static int ov6650_s_stream(struct v4l2_subdev *sd, int enable) 
	return 0;

}



/* Alter bus settings on camera side */

static int ov6650_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));

	int ret;



	flags = soc_camera_apply_sensor_flags(icl, flags);



	if (flags & SOCAM_PCLK_SAMPLE_RISING)

		ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_PCLK_RISING, 0);

	else

		ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_PCLK_RISING);

	if (ret)

		return ret;



	if (flags & SOCAM_HSYNC_ACTIVE_LOW)

		ret = ov6650_reg_rmw(client, REG_COMF, COMF_HREF_LOW, 0);

	else

		ret = ov6650_reg_rmw(client, REG_COMF, 0, COMF_HREF_LOW);

	if (ret)

		return ret;



	if (flags & SOCAM_VSYNC_ACTIVE_HIGH)

		ret = ov6650_reg_rmw(client, REG_COMJ, COMJ_VSYNC_HIGH, 0);

	else

		ret = ov6650_reg_rmw(client, REG_COMJ, 0, COMJ_VSYNC_HIGH);



	return ret;

}



/* Request bus settings on camera side */

static unsigned long ov6650_query_bus_param(struct soc_camera_device *icd)

{

	struct soc_camera_link *icl = to_soc_camera_link(icd);



	unsigned long flags = SOCAM_MASTER |

		SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING |

		SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW |

		SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW |

		SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;



	return soc_camera_apply_sensor_flags(icl, flags);

}



/* Get status of additional camera capabilities */

static int ov6650_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{
@@ -1095,8 +1049,6 @@ static int ov6650_video_probe(struct soc_camera_device *icd, 
}



static struct soc_camera_ops ov6650_ops = {

	.set_bus_param		= ov6650_set_bus_param,

	.query_bus_param	= ov6650_query_bus_param,

	.controls		= ov6650_controls,

	.num_controls		= ARRAY_SIZE(ov6650_controls),

};
@@ -1111,6 +1063,7 @@ static struct v4l2_subdev_core_ops ov6650_core_ops = { 
#endif

};



/* Request bus settings on camera side */

static int ov6650_g_mbus_config(struct v4l2_subdev *sd,

				struct v4l2_mbus_config *cfg)

{
@@ -1129,6 +1082,7 @@ static int ov6650_g_mbus_config(struct v4l2_subdev *sd, 
	return 0;

}



/* Alter bus settings on camera side */

static int ov6650_s_mbus_config(struct v4l2_subdev *sd,

				const struct v4l2_mbus_config *cfg)

{