Commit b4e9a2d2 authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Hans Verkuil
Browse files

media: i2c: Drop ifdeffery from sensor drivers 



Since commit 7d3c7d2a ("media: i2c: Add a camera sensor top level
menu") the CONFIG_MEDIA_CONTROLLER and CONFIG_VIDEO_V4L2_SUBDEV_API are
selected by the top-level VIDEO_CAMERA_SENSOR menu.

Remove all ifdefferies from camera sensor drivers to simplify the code.

Compile-tested only.

Signed-off-by: default avatarJacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent d1560d57

drivers/media/i2c/mt9m111.c

+1 −12
Original line number Diff line number Diff line
@@ -244,9 +244,7 @@ struct mt9m111 { 
	bool is_streaming;

	/* user point of view - 0: falling 1: rising edge */

	unsigned int pclk_sample:1;

#ifdef CONFIG_MEDIA_CONTROLLER

	struct media_pad pad;

#endif

};



static const struct mt9m111_mode_info mt9m111_mode_data[MT9M111_NUM_MODES] = {
@@ -527,13 +525,9 @@ static int mt9m111_get_fmt(struct v4l2_subdev *sd, 
		return -EINVAL;



	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		mf = v4l2_subdev_get_try_format(sd, sd_state, format->pad);

		format->format = *mf;

		return 0;

#else

		return -EINVAL;

#endif

	}



	mf->width	= mt9m111->width;
@@ -1120,7 +1114,6 @@ static int mt9m111_s_stream(struct v4l2_subdev *sd, int enable) 
static int mt9m111_init_cfg(struct v4l2_subdev *sd,

			    struct v4l2_subdev_state *sd_state)

{

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

	struct v4l2_mbus_framefmt *format =

		v4l2_subdev_get_try_format(sd, sd_state, 0);
@@ -1132,7 +1125,7 @@ static int mt9m111_init_cfg(struct v4l2_subdev *sd, 
	format->ycbcr_enc	= V4L2_YCBCR_ENC_DEFAULT;

	format->quantization	= V4L2_QUANTIZATION_DEFAULT;

	format->xfer_func	= V4L2_XFER_FUNC_DEFAULT;

#endif



	return 0;

}
@@ -1315,13 +1308,11 @@ static int mt9m111_probe(struct i2c_client *client) 
		return ret;

	}



#ifdef CONFIG_MEDIA_CONTROLLER

	mt9m111->pad.flags = MEDIA_PAD_FL_SOURCE;

	mt9m111->subdev.entity.function = MEDIA_ENT_F_CAM_SENSOR;

	ret = media_entity_pads_init(&mt9m111->subdev.entity, 1, &mt9m111->pad);

	if (ret < 0)

		goto out_hdlfree;

#endif



	mt9m111->current_mode = &mt9m111_mode_data[MT9M111_MODE_SXGA_15FPS];

	mt9m111->frame_interval.numerator = 1;
@@ -1350,10 +1341,8 @@ static int mt9m111_probe(struct i2c_client *client) 
	return 0;



out_entityclean:

#ifdef CONFIG_MEDIA_CONTROLLER

	media_entity_cleanup(&mt9m111->subdev.entity);

out_hdlfree:

#endif

	v4l2_ctrl_handler_free(&mt9m111->hdl);



	return ret;

drivers/media/i2c/mt9v011.c

+0 −6
Original line number Diff line number Diff line
@@ -49,9 +49,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-2)"); 


struct mt9v011 {

	struct v4l2_subdev sd;

#ifdef CONFIG_MEDIA_CONTROLLER

	struct media_pad pad;

#endif

	struct v4l2_ctrl_handler ctrls;

	unsigned width, height;

	unsigned xtal;
@@ -483,9 +481,7 @@ static int mt9v011_probe(struct i2c_client *c) 
	u16 version;

	struct mt9v011 *core;

	struct v4l2_subdev *sd;

#ifdef CONFIG_MEDIA_CONTROLLER

	int ret;

#endif



	/* Check if the adapter supports the needed features */

	if (!i2c_check_functionality(c->adapter,
@@ -499,14 +495,12 @@ static int mt9v011_probe(struct i2c_client *c) 
	sd = &core->sd;

	v4l2_i2c_subdev_init(sd, c, &mt9v011_ops);



#ifdef CONFIG_MEDIA_CONTROLLER

	core->pad.flags = MEDIA_PAD_FL_SOURCE;

	sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;



	ret = media_entity_pads_init(&sd->entity, 1, &core->pad);

	if (ret < 0)

		return ret;

#endif



	/* Check if the sensor is really a MT9V011 */

	version = mt9v011_read(sd, R00_MT9V011_CHIP_VERSION);

drivers/media/i2c/mt9v111.c

+0 −14
Original line number Diff line number Diff line
@@ -121,9 +121,7 @@ struct mt9v111_dev { 
	u8 addr_space;



	struct v4l2_subdev sd;

#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)

	struct media_pad pad;

#endif



	struct v4l2_ctrl *auto_awb;

	struct v4l2_ctrl *auto_exp;
@@ -797,11 +795,7 @@ static struct v4l2_mbus_framefmt *__mt9v111_get_pad_format( 
{

	switch (which) {

	case V4L2_SUBDEV_FORMAT_TRY:

#if IS_ENABLED(CONFIG_VIDEO_V4L2_SUBDEV_API)

		return v4l2_subdev_get_try_format(&mt9v111->sd, sd_state, pad);

#else

		return &sd_state->pads->try_fmt;

#endif

	case V4L2_SUBDEV_FORMAT_ACTIVE:

		return &mt9v111->fmt;

	default:
@@ -987,11 +981,9 @@ static const struct v4l2_subdev_ops mt9v111_ops = { 
	.pad	= &mt9v111_pad_ops,

};



#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)

static const struct media_entity_operations mt9v111_subdev_entity_ops = {

	.link_validate = v4l2_subdev_link_validate,

};

#endif



/* --- V4L2 ctrl --- */

static int mt9v111_s_ctrl(struct v4l2_ctrl *ctrl)
@@ -1203,7 +1195,6 @@ static int mt9v111_probe(struct i2c_client *client) 


	v4l2_i2c_subdev_init(&mt9v111->sd, client, &mt9v111_ops);



#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)

	mt9v111->sd.flags	|= V4L2_SUBDEV_FL_HAS_DEVNODE;

	mt9v111->sd.entity.ops	= &mt9v111_subdev_entity_ops;

	mt9v111->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
@@ -1212,7 +1203,6 @@ static int mt9v111_probe(struct i2c_client *client) 
	ret = media_entity_pads_init(&mt9v111->sd.entity, 1, &mt9v111->pad);

	if (ret)

		goto error_free_entity;

#endif



	ret = mt9v111_chip_probe(mt9v111);

	if (ret)
@@ -1225,9 +1215,7 @@ static int mt9v111_probe(struct i2c_client *client) 
	return 0;



error_free_entity:

#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&mt9v111->sd.entity);

#endif



error_free_ctrls:

	v4l2_ctrl_handler_free(&mt9v111->ctrls);
@@ -1245,9 +1233,7 @@ static void mt9v111_remove(struct i2c_client *client) 


	v4l2_async_unregister_subdev(sd);



#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)

	media_entity_cleanup(&sd->entity);

#endif



	v4l2_ctrl_handler_free(&mt9v111->ctrls);

drivers/media/i2c/ov2640.c

+1 −10
Original line number Diff line number Diff line
@@ -293,9 +293,7 @@ struct ov2640_win_size { 


struct ov2640_priv {

	struct v4l2_subdev		subdev;

#if defined(CONFIG_MEDIA_CONTROLLER)

	struct media_pad pad;

#endif

	struct v4l2_ctrl_handler	hdl;

	u32	cfmt_code;

	struct clk			*clk;
@@ -922,13 +920,9 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd, 
		return -EINVAL;



	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		mf = v4l2_subdev_get_try_format(sd, sd_state, 0);

		format->format = *mf;

		return 0;

#else

		return -EINVAL;

#endif

	}



	mf->width	= priv->win->width;
@@ -1005,7 +999,6 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd, 
static int ov2640_init_cfg(struct v4l2_subdev *sd,

			   struct v4l2_subdev_state *sd_state)

{

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

	struct v4l2_mbus_framefmt *try_fmt =

		v4l2_subdev_get_try_format(sd, sd_state, 0);

	const struct ov2640_win_size *win =
@@ -1019,7 +1012,7 @@ static int ov2640_init_cfg(struct v4l2_subdev *sd, 
	try_fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;

	try_fmt->quantization = V4L2_QUANTIZATION_DEFAULT;

	try_fmt->xfer_func = V4L2_XFER_FUNC_DEFAULT;

#endif



	return 0;

}
@@ -1236,13 +1229,11 @@ static int ov2640_probe(struct i2c_client *client) 
		ret = priv->hdl.error;

		goto err_hdl;

	}

#if defined(CONFIG_MEDIA_CONTROLLER)

	priv->pad.flags = MEDIA_PAD_FL_SOURCE;

	priv->subdev.entity.function = MEDIA_ENT_F_CAM_SENSOR;

	ret = media_entity_pads_init(&priv->subdev.entity, 1, &priv->pad);

	if (ret < 0)

		goto err_hdl;

#endif



	ret = ov2640_video_probe(client);

	if (ret < 0)

drivers/media/i2c/ov2659.c

+1 −15
Original line number Diff line number Diff line
@@ -1031,7 +1031,6 @@ static int ov2659_get_fmt(struct v4l2_subdev *sd, 
	dev_dbg(&client->dev, "ov2659_get_fmt\n");



	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		struct v4l2_mbus_framefmt *mf;



		mf = v4l2_subdev_get_try_format(sd, sd_state, 0);
@@ -1039,9 +1038,6 @@ static int ov2659_get_fmt(struct v4l2_subdev *sd, 
		fmt->format = *mf;

		mutex_unlock(&ov2659->lock);

		return 0;

#else

		return -EINVAL;

#endif

	}



	mutex_lock(&ov2659->lock);
@@ -1113,10 +1109,8 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd, 
	mutex_lock(&ov2659->lock);



	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);

		*mf = fmt->format;

#endif

	} else {

		s64 val;
@@ -1306,7 +1300,6 @@ static int ov2659_power_on(struct device *dev) 
 * V4L2 subdev internal operations

 */



#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

static int ov2659_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -1319,7 +1312,6 @@ static int ov2659_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 


	return 0;

}

#endif



static const struct v4l2_subdev_core_ops ov2659_subdev_core_ops = {

	.log_status = v4l2_ctrl_subdev_log_status,
@@ -1338,7 +1330,6 @@ static const struct v4l2_subdev_pad_ops ov2659_subdev_pad_ops = { 
	.set_fmt = ov2659_set_fmt,

};



#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

static const struct v4l2_subdev_ops ov2659_subdev_ops = {

	.core  = &ov2659_subdev_core_ops,

	.video = &ov2659_subdev_video_ops,
@@ -1348,7 +1339,6 @@ static const struct v4l2_subdev_ops ov2659_subdev_ops = { 
static const struct v4l2_subdev_internal_ops ov2659_subdev_internal_ops = {

	.open = ov2659_open,

};

#endif



static int ov2659_detect(struct v4l2_subdev *sd)

{
@@ -1489,15 +1479,12 @@ static int ov2659_probe(struct i2c_client *client) 


	sd = &ov2659->sd;

	client->flags |= I2C_CLIENT_SCCB;

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

	v4l2_i2c_subdev_init(sd, client, &ov2659_subdev_ops);



	v4l2_i2c_subdev_init(sd, client, &ov2659_subdev_ops);

	sd->internal_ops = &ov2659_subdev_internal_ops;

	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |

		     V4L2_SUBDEV_FL_HAS_EVENTS;

#endif



#if defined(CONFIG_MEDIA_CONTROLLER)

	ov2659->pad.flags = MEDIA_PAD_FL_SOURCE;

	sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;

	ret = media_entity_pads_init(&sd->entity, 1, &ov2659->pad);
@@ -1505,7 +1492,6 @@ static int ov2659_probe(struct i2c_client *client) 
		v4l2_ctrl_handler_free(&ov2659->ctrls);

		return ret;

	}

#endif



	mutex_init(&ov2659->lock);