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

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

[media] fsl-viu: drop format names 



The names of the pixelformats is set by the core. So there no longer
is any need for drivers to fill it in.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9acc8093

drivers/media/platform/fsl-viu.c

+2 −7
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static int info_level; 
 * Basic structures

 */

struct viu_fmt {

	char  name[32];

	u32   fourcc;		/* v4l2 format id */

	u32   pixelformat;

	int   depth;
@@ -63,12 +62,10 @@ struct viu_fmt { 


static struct viu_fmt formats[] = {

	{

		.name		= "RGB-16 (5/B-6/G-5/R)",

		.fourcc		= V4L2_PIX_FMT_RGB565,

		.pixelformat	= V4L2_PIX_FMT_RGB565,

		.depth		= 16,

	}, {

		.name		= "RGB-32 (A-R-G-B)",

		.fourcc		= V4L2_PIX_FMT_RGB32,

		.pixelformat	= V4L2_PIX_FMT_RGB32,

		.depth		= 32,
@@ -584,7 +581,6 @@ static int vidioc_enum_fmt(struct file *file, void *priv, 
	if (f->index >= NUM_FORMATS)

		return -EINVAL;



	strlcpy(f->description, formats[index].name, sizeof(f->description));

	f->pixelformat = formats[index].fourcc;

	return 0;

}
@@ -655,7 +651,6 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, 
	fh->sizeimage     = f->fmt.pix.sizeimage;

	fh->vb_vidq.field = f->fmt.pix.field;

	fh->type          = f->type;

	dprintk(1, "set to pixelformat '%4.6s'\n", (char *)&fh->fmt->name);

	return 0;

}
@@ -721,8 +716,8 @@ static int viu_setup_preview(struct viu_dev *dev, struct viu_fh *fh) 
{

	int bpp;



	dprintk(1, "%s %dx%d %s\n", __func__,

		fh->win.w.width, fh->win.w.height, dev->ovfmt->name);

	dprintk(1, "%s %dx%d\n", __func__,

		fh->win.w.width, fh->win.w.height);



	reg_val.status_cfg = 0;