Commit 43ba4641 authored by Boris BREZILLON's avatar Boris BREZILLON Committed by Mauro Carvalho Chehab
Browse files

[media] pci: Make use of MEDIA_BUS_FMT definitions 



In order to have subsytem agnostic media bus format definitions we've
moved media bus definition to include/uapi/linux/media-bus-format.h and
prefixed values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.

Replace all references to the old definitions in pci drivers.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f5fe58fd

drivers/media/pci/cx18/cx18-av-core.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static int cx18_av_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt 
	int HSC, VSC, Vsrc, Hsrc, filter, Vlines;

	int is_50Hz = !(state->std & V4L2_STD_525_60);



	if (fmt->code != V4L2_MBUS_FMT_FIXED)

	if (fmt->code != MEDIA_BUS_FMT_FIXED)

		return -EINVAL;



	fmt->field = V4L2_FIELD_INTERLACED;

drivers/media/pci/cx18/cx18-controls.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int cx18_s_video_encoding(struct cx2341x_handler *cxhdl, u32 val) 
	/* fix videodecoder resolution */

	fmt.width = cxhdl->width / (is_mpeg1 ? 2 : 1);

	fmt.height = cxhdl->height;

	fmt.code = V4L2_MBUS_FMT_FIXED;

	fmt.code = MEDIA_BUS_FMT_FIXED;

	v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &fmt);

	return 0;

}

drivers/media/pci/cx18/cx18-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh, 


	mbus_fmt.width = cx->cxhdl.width = w;

	mbus_fmt.height = cx->cxhdl.height = h;

	mbus_fmt.code = V4L2_MBUS_FMT_FIXED;

	mbus_fmt.code = MEDIA_BUS_FMT_FIXED;

	v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &mbus_fmt);

	return cx18_g_fmt_vid_cap(file, fh, fmt);

}

drivers/media/pci/cx23885/cx23885-video.c

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 
	dev->field	= f->fmt.pix.field;

	dprintk(2, "%s() width=%d height=%d field=%d\n", __func__,

		dev->width, dev->height, dev->field);

	v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);

	v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, MEDIA_BUS_FMT_FIXED);

	call_all(dev, video, s_mbus_fmt, &mbus_fmt);

	v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);

	/* s_mbus_fmt overwrites f->fmt.pix.field, restore it */

drivers/media/pci/ivtv/ivtv-controls.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int ivtv_s_video_encoding(struct cx2341x_handler *cxhdl, u32 val) 
	/* fix videodecoder resolution */

	fmt.width = cxhdl->width / (is_mpeg1 ? 2 : 1);

	fmt.height = cxhdl->height;

	fmt.code = V4L2_MBUS_FMT_FIXED;

	fmt.code = MEDIA_BUS_FMT_FIXED;

	v4l2_subdev_call(itv->sd_video, video, s_mbus_fmt, &fmt);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE