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

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

V4L/DVB: tvp514x: remove obsolete enum/try/s/g_fmt 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d3ca7759

drivers/media/video/tvp514x.c

+0 −71
Original line number Original line Diff line number Diff line
@@ -948,31 +948,6 @@ tvp514x_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index, 
	return 0;

	return 0;

}

}





/**

 * tvp514x_enum_fmt_cap() - V4L2 decoder interface handler for enum_fmt

 * @sd: pointer to standard V4L2 sub-device structure

 * @fmt: standard V4L2 VIDIOC_ENUM_FMT ioctl structure

 *

 * Implement the VIDIOC_ENUM_FMT ioctl to enumerate supported formats

 */

static int

tvp514x_enum_fmt_cap(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmt)

{

	if (fmt == NULL || fmt->index)

		return -EINVAL;



	if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		/* only capture is supported */

		return -EINVAL;



	/* only one format */

	fmt->flags = 0;

	strlcpy(fmt->description, "8-bit UYVY 4:2:2 Format",

					sizeof(fmt->description));

	fmt->pixelformat = V4L2_PIX_FMT_UYVY;

	return 0;

}



/**

/**

 * tvp514x_mbus_fmt_cap() - V4L2 decoder interface handler for try/s/g_mbus_fmt

 * tvp514x_mbus_fmt_cap() - V4L2 decoder interface handler for try/s/g_mbus_fmt

 * @sd: pointer to standard V4L2 sub-device structure

 * @sd: pointer to standard V4L2 sub-device structure
@@ -1003,48 +978,6 @@ tvp514x_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f) 
	return 0;

	return 0;

}

}





/**

 * tvp514x_fmt_cap() - V4L2 decoder interface handler for try/s/g_fmt

 * @sd: pointer to standard V4L2 sub-device structure

 * @f: pointer to standard V4L2 VIDIOC_TRY_FMT ioctl structure

 *

 * Implement the VIDIOC_TRY/S/G_FMT ioctl for the CAPTURE buffer type. This

 * ioctl is used to negotiate the image capture size and pixel format.

 */

static int

tvp514x_fmt_cap(struct v4l2_subdev *sd, struct v4l2_format *f)

{

	struct tvp514x_decoder *decoder = to_decoder(sd);

	struct v4l2_pix_format *pix;

	enum tvp514x_std current_std;



	if (f == NULL)

		return -EINVAL;



	if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	pix = &f->fmt.pix;



	/* Calculate height and width based on current standard */

	current_std = decoder->current_std;



	pix->pixelformat = V4L2_PIX_FMT_UYVY;

	pix->width = decoder->std_list[current_std].width;

	pix->height = decoder->std_list[current_std].height;

	pix->field = V4L2_FIELD_INTERLACED;

	pix->bytesperline = pix->width * 2;

	pix->sizeimage = pix->bytesperline * pix->height;

	pix->colorspace = V4L2_COLORSPACE_SMPTE170M;

	pix->priv = 0;



	v4l2_dbg(1, debug, sd, "FMT: bytesperline - %d"

			"Width - %d, Height - %d\n",

			pix->bytesperline,

			pix->width, pix->height);

	return 0;

}



/**

/**

 * tvp514x_g_parm() - V4L2 decoder interface handler for g_parm

 * tvp514x_g_parm() - V4L2 decoder interface handler for g_parm

 * @sd: pointer to standard V4L2 sub-device structure

 * @sd: pointer to standard V4L2 sub-device structure
@@ -1181,10 +1114,6 @@ static const struct v4l2_subdev_core_ops tvp514x_core_ops = { 
static const struct v4l2_subdev_video_ops tvp514x_video_ops = {

static const struct v4l2_subdev_video_ops tvp514x_video_ops = {

	.s_routing = tvp514x_s_routing,

	.s_routing = tvp514x_s_routing,

	.querystd = tvp514x_querystd,

	.querystd = tvp514x_querystd,

	.enum_fmt = tvp514x_enum_fmt_cap,

	.g_fmt = tvp514x_fmt_cap,

	.try_fmt = tvp514x_fmt_cap,

	.s_fmt = tvp514x_fmt_cap,

	.enum_mbus_fmt = tvp514x_enum_mbus_fmt,

	.enum_mbus_fmt = tvp514x_enum_mbus_fmt,

	.g_mbus_fmt = tvp514x_mbus_fmt,

	.g_mbus_fmt = tvp514x_mbus_fmt,

	.try_mbus_fmt = tvp514x_mbus_fmt,

	.try_mbus_fmt = tvp514x_mbus_fmt,