Commit 49c282d5 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: ov2680: Remove VIDEO_V4L2_SUBDEV_API ifdef-s 



VIDEO_V4L2_SUBDEV_API is now automatically selected in Kconfig
for all sensor drivers. Remove the ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
checks.

This is a preparation patch for fixing ov2680_set_fmt()
which == V4L2_SUBDEV_FORMAT_TRY calls not properly filling in
the passed in v4l2_mbus_framefmt struct.

Fixes: 3ee47cad ("media: ov2680: Add Omnivision OV2680 sensor driver")
Reviewed-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent d5d08ad3

drivers/media/i2c/ov2680.c

+2 −14
Original line number Diff line number Diff line
@@ -562,7 +562,6 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd, 
{

	struct ov2680_dev *sensor = to_ov2680_dev(sd);

	struct v4l2_mbus_framefmt *fmt = NULL;

	int ret = 0;



	if (format->pad != 0)

		return -EINVAL;
@@ -570,22 +569,17 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd, 
	mutex_lock(&sensor->lock);



	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		fmt = v4l2_subdev_get_try_format(&sensor->sd, sd_state,

						 format->pad);

#else

		ret = -EINVAL;

#endif

	} else {

		fmt = &sensor->fmt;

	}



	if (fmt)

	format->format = *fmt;



	mutex_unlock(&sensor->lock);



	return ret;

	return 0;

}



static int ov2680_set_fmt(struct v4l2_subdev *sd,
@@ -594,9 +588,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, 
{

	struct ov2680_dev *sensor = to_ov2680_dev(sd);

	struct v4l2_mbus_framefmt *fmt = &format->format;

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

	struct v4l2_mbus_framefmt *try_fmt;

#endif

	const struct ov2680_mode_info *mode;

	int ret = 0;
@@ -619,10 +611,8 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, 
	}



	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

		try_fmt = v4l2_subdev_get_try_format(sd, sd_state, 0);

		format->format = *try_fmt;

#endif

		goto unlock;

	}
@@ -780,9 +770,7 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) 
	v4l2_i2c_subdev_init(&sensor->sd, sensor->i2c_client,

			     &ov2680_subdev_ops);



#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

	sensor->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;

#endif

	sensor->pad.flags = MEDIA_PAD_FL_SOURCE;

	sensor->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;