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

Commit da298c6d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: replace video op g_mbus_fmt by pad op get_fmt 



The g_mbus_fmt video op is a duplicate of the pad op. Replace all uses
by the get_fmt pad op and remove the video op.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarPrabhakar Lad <prabhakar.csengg@gmail.com>
Cc: Kamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent ebcff5fc

drivers/media/i2c/adv7170.c

+8 −3
Original line number Diff line number Diff line
@@ -273,11 +273,16 @@ static int adv7170_enum_mbus_code(struct v4l2_subdev *sd, 
	return 0;

}



static int adv7170_g_fmt(struct v4l2_subdev *sd,

				struct v4l2_mbus_framefmt *mf)

static int adv7170_get_fmt(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_format *format)

{

	struct v4l2_mbus_framefmt *mf = &format->format;

	u8 val = adv7170_read(sd, 0x7);



	if (format->pad)

		return -EINVAL;



	if ((val & 0x40) == (1 << 6))

		mf->code = MEDIA_BUS_FMT_UYVY8_1X16;

	else
@@ -323,11 +328,11 @@ static const struct v4l2_subdev_video_ops adv7170_video_ops = { 
	.s_std_output = adv7170_s_std_output,

	.s_routing = adv7170_s_routing,

	.s_mbus_fmt = adv7170_s_fmt,

	.g_mbus_fmt = adv7170_g_fmt,

};



static const struct v4l2_subdev_pad_ops adv7170_pad_ops = {

	.enum_mbus_code = adv7170_enum_mbus_code,

	.get_fmt = adv7170_get_fmt,

};



static const struct v4l2_subdev_ops adv7170_ops = {

drivers/media/i2c/adv7175.c

+8 −3
Original line number Diff line number Diff line
@@ -311,11 +311,16 @@ static int adv7175_enum_mbus_code(struct v4l2_subdev *sd, 
	return 0;

}



static int adv7175_g_fmt(struct v4l2_subdev *sd,

				struct v4l2_mbus_framefmt *mf)

static int adv7175_get_fmt(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_format *format)

{

	struct v4l2_mbus_framefmt *mf = &format->format;

	u8 val = adv7175_read(sd, 0x7);



	if (format->pad)

		return -EINVAL;



	if ((val & 0x40) == (1 << 6))

		mf->code = MEDIA_BUS_FMT_UYVY8_1X16;

	else
@@ -376,11 +381,11 @@ static const struct v4l2_subdev_video_ops adv7175_video_ops = { 
	.s_std_output = adv7175_s_std_output,

	.s_routing = adv7175_s_routing,

	.s_mbus_fmt = adv7175_s_fmt,

	.g_mbus_fmt = adv7175_g_fmt,

};



static const struct v4l2_subdev_pad_ops adv7175_pad_ops = {

	.enum_mbus_code = adv7175_enum_mbus_code,

	.get_fmt = adv7175_get_fmt,

};



static const struct v4l2_subdev_ops adv7175_ops = {

drivers/media/i2c/adv7183.c

+8 −4
Original line number Diff line number Diff line
@@ -460,12 +460,16 @@ static int adv7183_s_mbus_fmt(struct v4l2_subdev *sd, 
	return 0;

}



static int adv7183_g_mbus_fmt(struct v4l2_subdev *sd,

				struct v4l2_mbus_framefmt *fmt)

static int adv7183_get_fmt(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_format *format)

{

	struct adv7183 *decoder = to_adv7183(sd);



	*fmt = decoder->fmt;

	if (format->pad)

		return -EINVAL;



	format->format = decoder->fmt;

	return 0;

}
@@ -517,12 +521,12 @@ static const struct v4l2_subdev_video_ops adv7183_video_ops = { 
	.g_input_status = adv7183_g_input_status,

	.try_mbus_fmt = adv7183_try_mbus_fmt,

	.s_mbus_fmt = adv7183_s_mbus_fmt,

	.g_mbus_fmt = adv7183_g_mbus_fmt,

	.s_stream = adv7183_s_stream,

};



static const struct v4l2_subdev_pad_ops adv7183_pad_ops = {

	.enum_mbus_code = adv7183_enum_mbus_code,

	.get_fmt = adv7183_get_fmt,

};



static const struct v4l2_subdev_ops adv7183_ops = {

drivers/media/i2c/adv7842.c

+9 −5
Original line number Diff line number Diff line
@@ -1878,11 +1878,16 @@ static int adv7842_enum_mbus_code(struct v4l2_subdev *sd, 
	return 0;

}



static int adv7842_g_mbus_fmt(struct v4l2_subdev *sd,

			      struct v4l2_mbus_framefmt *fmt)

static int adv7842_fill_fmt(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_format *format)

{

	struct v4l2_mbus_framefmt *fmt = &format->format;

	struct adv7842_state *state = to_state(sd);



	if (format->pad)

		return -EINVAL;



	fmt->width = state->timings.bt.width;

	fmt->height = state->timings.bt.height;

	fmt->code = MEDIA_BUS_FMT_FIXED;
@@ -2810,9 +2815,6 @@ static const struct v4l2_subdev_video_ops adv7842_video_ops = { 
	.s_dv_timings = adv7842_s_dv_timings,

	.g_dv_timings = adv7842_g_dv_timings,

	.query_dv_timings = adv7842_query_dv_timings,

	.g_mbus_fmt = adv7842_g_mbus_fmt,

	.try_mbus_fmt = adv7842_g_mbus_fmt,

	.s_mbus_fmt = adv7842_g_mbus_fmt,

};



static const struct v4l2_subdev_pad_ops adv7842_pad_ops = {
@@ -2821,6 +2823,8 @@ static const struct v4l2_subdev_pad_ops adv7842_pad_ops = { 
	.enum_dv_timings = adv7842_enum_dv_timings,

	.dv_timings_cap = adv7842_dv_timings_cap,

	.enum_mbus_code = adv7842_enum_mbus_code,

	.get_fmt = adv7842_fill_fmt,

	.set_fmt = adv7842_fill_fmt,

};



static const struct v4l2_subdev_ops adv7842_ops = {

drivers/media/i2c/ak881x.c

+9 −15
Original line number Diff line number Diff line
@@ -93,12 +93,17 @@ static int ak881x_s_register(struct v4l2_subdev *sd, 
}

#endif



static int ak881x_try_g_mbus_fmt(struct v4l2_subdev *sd,

				 struct v4l2_mbus_framefmt *mf)

static int ak881x_fill_fmt(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_format *format)

{

	struct v4l2_mbus_framefmt *mf = &format->format;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct ak881x *ak881x = to_ak881x(client);



	if (format->pad)

		return -EINVAL;



	v4l_bound_align_image(&mf->width, 0, 720, 2,

			      &mf->height, 0, ak881x->lines, 1, 0);

	mf->field	= V4L2_FIELD_INTERLACED;
@@ -108,16 +113,6 @@ static int ak881x_try_g_mbus_fmt(struct v4l2_subdev *sd, 
	return 0;

}



static int ak881x_s_mbus_fmt(struct v4l2_subdev *sd,

			     struct v4l2_mbus_framefmt *mf)

{

	if (mf->field != V4L2_FIELD_INTERLACED ||

	    mf->code != MEDIA_BUS_FMT_YUYV8_2X8)

		return -EINVAL;



	return ak881x_try_g_mbus_fmt(sd, mf);

}



static int ak881x_enum_mbus_code(struct v4l2_subdev *sd,

		struct v4l2_subdev_pad_config *cfg,

		struct v4l2_subdev_mbus_code_enum *code)
@@ -212,9 +207,6 @@ static struct v4l2_subdev_core_ops ak881x_subdev_core_ops = { 
};



static struct v4l2_subdev_video_ops ak881x_subdev_video_ops = {

	.s_mbus_fmt	= ak881x_s_mbus_fmt,

	.g_mbus_fmt	= ak881x_try_g_mbus_fmt,

	.try_mbus_fmt	= ak881x_try_g_mbus_fmt,

	.cropcap	= ak881x_cropcap,

	.s_std_output	= ak881x_s_std_output,

	.s_stream	= ak881x_s_stream,
@@ -222,6 +214,8 @@ static struct v4l2_subdev_video_ops ak881x_subdev_video_ops = { 


static const struct v4l2_subdev_pad_ops ak881x_subdev_pad_ops = {

	.enum_mbus_code = ak881x_enum_mbus_code,

	.set_fmt	= ak881x_fill_fmt,

	.get_fmt	= ak881x_fill_fmt,

};



static struct v4l2_subdev_ops ak881x_subdev_ops = {