Commit 23321b91 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: ov2680: Add an __ov2680_get_pad_format() helper function 



Add an __ov2680_get_pad_format() helper function.

This is a preparation patch for adding selections support.

Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Reviewed-by: default avatarDaniel Scally <dan.scally@ideasonboard.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 63f47529

drivers/media/i2c/ov2680.c

+16 −10
Original line number Diff line number Diff line
@@ -220,6 +220,18 @@ static void ov2680_set_bayer_order(struct ov2680_dev *sensor, 
	fmt->code = ov2680_hv_flip_bayer_order[hv_flip];

}



static struct v4l2_mbus_framefmt *

__ov2680_get_pad_format(struct ov2680_dev *sensor,

			struct v4l2_subdev_state *state,

			unsigned int pad,

			enum v4l2_subdev_format_whence which)

{

	if (which == V4L2_SUBDEV_FORMAT_TRY)

		return v4l2_subdev_get_try_format(&sensor->sd, state, pad);



	return &sensor->mode.fmt;

}



static void ov2680_fill_format(struct ov2680_dev *sensor,

			       struct v4l2_mbus_framefmt *fmt,

			       unsigned int width, unsigned int height)
@@ -508,22 +520,16 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd, 
			  struct v4l2_subdev_format *format)

{

	struct ov2680_dev *sensor = to_ov2680_dev(sd);

	struct v4l2_mbus_framefmt *fmt = NULL;

	struct v4l2_mbus_framefmt *fmt;



	if (format->pad != 0)

		return -EINVAL;



	mutex_lock(&sensor->lock);



	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {

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

						 format->pad);

	} else {

		fmt = &sensor->mode.fmt;

	}

	fmt = __ov2680_get_pad_format(sensor, sd_state, format->pad,

				      format->which);



	mutex_lock(&sensor->lock);

	format->format = *fmt;



	mutex_unlock(&sensor->lock);



	return 0;