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

media: media/pci: don't set description for ENUM_FMT 



The V4L2 core sets the description for the driver in order to ensure
consistent naming.

So drop the strscpy of the description in drivers. Also remove any
description strings in driver-internal structures since those are
no longer needed.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 009cb7d5

drivers/media/common/saa7146/saa7146_video.c

+2 −14
Original line number Diff line number Diff line
@@ -20,62 +20,52 @@ MODULE_PARM_DESC(max_memory, "maximum memory usage for capture buffers (default: 
/* format descriptions for capture and preview */

static struct saa7146_format formats[] = {

	{

		.name		= "RGB-8 (3-3-2)",

		.pixelformat	= V4L2_PIX_FMT_RGB332,

		.trans		= RGB08_COMPOSED,

		.depth		= 8,

		.flags		= 0,

	}, {

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

		.pixelformat	= V4L2_PIX_FMT_RGB565,

		.trans		= RGB16_COMPOSED,

		.depth		= 16,

		.flags		= 0,

	}, {

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

		.pixelformat	= V4L2_PIX_FMT_BGR24,

		.trans		= RGB24_COMPOSED,

		.depth		= 24,

		.flags		= 0,

	}, {

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

		.pixelformat	= V4L2_PIX_FMT_BGR32,

		.trans		= RGB32_COMPOSED,

		.depth		= 32,

		.flags		= 0,

	}, {

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

		.pixelformat	= V4L2_PIX_FMT_RGB32,

		.trans		= RGB32_COMPOSED,

		.depth		= 32,

		.flags		= 0,

		.swap		= 0x2,

	}, {

		.name		= "Greyscale-8",

		.pixelformat	= V4L2_PIX_FMT_GREY,

		.trans		= Y8,

		.depth		= 8,

		.flags		= 0,

	}, {

		.name		= "YUV 4:2:2 planar (Y-Cb-Cr)",

		.pixelformat	= V4L2_PIX_FMT_YUV422P,

		.trans		= YUV422_DECOMPOSED,

		.depth		= 16,

		.flags		= FORMAT_BYTE_SWAP|FORMAT_IS_PLANAR,

	}, {

		.name		= "YVU 4:2:0 planar (Y-Cb-Cr)",

		.pixelformat	= V4L2_PIX_FMT_YVU420,

		.trans		= YUV420_DECOMPOSED,

		.depth		= 12,

		.flags		= FORMAT_BYTE_SWAP|FORMAT_IS_PLANAR,

	}, {

		.name		= "YUV 4:2:0 planar (Y-Cb-Cr)",

		.pixelformat	= V4L2_PIX_FMT_YUV420,

		.trans		= YUV420_DECOMPOSED,

		.depth		= 12,

		.flags		= FORMAT_IS_PLANAR,

	}, {

		.name		= "YUV 4:2:2 (U-Y-V-Y)",

		.pixelformat	= V4L2_PIX_FMT_UYVY,

		.trans		= YUV422_COMPOSED,

		.depth		= 16,
@@ -147,10 +137,10 @@ int saa7146_start_preview(struct saa7146_fh *fh) 
	}

	vv->ov.win = fmt.fmt.win;



	DEB_D("%dx%d+%d+%d %s field=%s\n",

	DEB_D("%dx%d+%d+%d 0x%08x field=%s\n",

	      vv->ov.win.w.width, vv->ov.win.w.height,

	      vv->ov.win.w.left, vv->ov.win.w.top,

	      vv->ov_fmt->name, v4l2_field_names[vv->ov.win.field]);

	      vv->ov_fmt->pixelformat, v4l2_field_names[vv->ov.win.field]);



	if (0 != (ret = saa7146_enable_overlay(fh))) {

		DEB_D("enabling overlay failed: %d\n", ret);
@@ -515,8 +505,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *fh, struct v4l2_fmtd 
{

	if (f->index >= ARRAY_SIZE(formats))

		return -EINVAL;

	strscpy((char *)f->description, formats[f->index].name,

		sizeof(f->description));

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

	return 0;

}

drivers/media/pci/bt8xx/bttv-driver.c

+0 −19
Original line number Diff line number Diff line
@@ -503,77 +503,65 @@ static const unsigned int BTTV_TVNORMS = ARRAY_SIZE(bttv_tvnorms); 
   packed pixel formats must come first */

static const struct bttv_format formats[] = {

	{

		.name     = "8 bpp, gray",

		.fourcc   = V4L2_PIX_FMT_GREY,

		.btformat = BT848_COLOR_FMT_Y8,

		.depth    = 8,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "8 bpp, dithered color",

		.fourcc   = V4L2_PIX_FMT_HI240,

		.btformat = BT848_COLOR_FMT_RGB8,

		.depth    = 8,

		.flags    = FORMAT_FLAGS_PACKED | FORMAT_FLAGS_DITHER,

	},{

		.name     = "15 bpp RGB, le",

		.fourcc   = V4L2_PIX_FMT_RGB555,

		.btformat = BT848_COLOR_FMT_RGB15,

		.depth    = 16,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "15 bpp RGB, be",

		.fourcc   = V4L2_PIX_FMT_RGB555X,

		.btformat = BT848_COLOR_FMT_RGB15,

		.btswap   = 0x03, /* byteswap */

		.depth    = 16,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "16 bpp RGB, le",

		.fourcc   = V4L2_PIX_FMT_RGB565,

		.btformat = BT848_COLOR_FMT_RGB16,

		.depth    = 16,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "16 bpp RGB, be",

		.fourcc   = V4L2_PIX_FMT_RGB565X,

		.btformat = BT848_COLOR_FMT_RGB16,

		.btswap   = 0x03, /* byteswap */

		.depth    = 16,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "24 bpp RGB, le",

		.fourcc   = V4L2_PIX_FMT_BGR24,

		.btformat = BT848_COLOR_FMT_RGB24,

		.depth    = 24,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "32 bpp RGB, le",

		.fourcc   = V4L2_PIX_FMT_BGR32,

		.btformat = BT848_COLOR_FMT_RGB32,

		.depth    = 32,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "32 bpp RGB, be",

		.fourcc   = V4L2_PIX_FMT_RGB32,

		.btformat = BT848_COLOR_FMT_RGB32,

		.btswap   = 0x0f, /* byte+word swap */

		.depth    = 32,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "4:2:2, packed, YUYV",

		.fourcc   = V4L2_PIX_FMT_YUYV,

		.btformat = BT848_COLOR_FMT_YUY2,

		.depth    = 16,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "4:2:2, packed, UYVY",

		.fourcc   = V4L2_PIX_FMT_UYVY,

		.btformat = BT848_COLOR_FMT_YUY2,

		.btswap   = 0x03, /* byteswap */

		.depth    = 16,

		.flags    = FORMAT_FLAGS_PACKED,

	},{

		.name     = "4:2:2, planar, Y-Cb-Cr",

		.fourcc   = V4L2_PIX_FMT_YUV422P,

		.btformat = BT848_COLOR_FMT_YCrCb422,

		.depth    = 16,
@@ -581,7 +569,6 @@ static const struct bttv_format formats[] = { 
		.hshift   = 1,

		.vshift   = 0,

	},{

		.name     = "4:2:0, planar, Y-Cb-Cr",

		.fourcc   = V4L2_PIX_FMT_YUV420,

		.btformat = BT848_COLOR_FMT_YCrCb422,

		.depth    = 12,
@@ -589,7 +576,6 @@ static const struct bttv_format formats[] = { 
		.hshift   = 1,

		.vshift   = 1,

	},{

		.name     = "4:2:0, planar, Y-Cr-Cb",

		.fourcc   = V4L2_PIX_FMT_YVU420,

		.btformat = BT848_COLOR_FMT_YCrCb422,

		.depth    = 12,
@@ -597,7 +583,6 @@ static const struct bttv_format formats[] = { 
		.hshift   = 1,

		.vshift   = 1,

	},{

		.name     = "4:1:1, planar, Y-Cb-Cr",

		.fourcc   = V4L2_PIX_FMT_YUV411P,

		.btformat = BT848_COLOR_FMT_YCrCb411,

		.depth    = 12,
@@ -605,7 +590,6 @@ static const struct bttv_format formats[] = { 
		.hshift   = 2,

		.vshift   = 0,

	},{

		.name     = "4:1:0, planar, Y-Cb-Cr",

		.fourcc   = V4L2_PIX_FMT_YUV410,

		.btformat = BT848_COLOR_FMT_YCrCb411,

		.depth    = 9,
@@ -613,7 +597,6 @@ static const struct bttv_format formats[] = { 
		.hshift   = 2,

		.vshift   = 2,

	},{

		.name     = "4:1:0, planar, Y-Cr-Cb",

		.fourcc   = V4L2_PIX_FMT_YVU410,

		.btformat = BT848_COLOR_FMT_YCrCb411,

		.depth    = 9,
@@ -621,7 +604,6 @@ static const struct bttv_format formats[] = { 
		.hshift   = 2,

		.vshift   = 2,

	},{

		.name     = "raw scanlines",

		.fourcc   = -1,

		.btformat = BT848_COLOR_FMT_RAW,

		.depth    = 8,
@@ -2500,7 +2482,6 @@ static int bttv_enum_fmt_cap_ovr(struct v4l2_fmtdesc *f) 
		return -EINVAL;



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

	strscpy(f->description, formats[i].name, sizeof(f->description));



	return i;

}

drivers/media/pci/bt8xx/bttv-risc.c

+4 −4
Original line number Diff line number Diff line
@@ -699,9 +699,9 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf) 
	const struct bttv_tvnorm *tvnorm = bttv_tvnorms + buf->tvnorm;

	struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);



	dprintk("%d: buffer field: %s  format: %s  size: %dx%d\n",

	dprintk("%d: buffer field: %s  format: 0x%08x  size: %dx%d\n",

		btv->c.nr, v4l2_field_names[buf->vb.field],

		buf->fmt->name, buf->vb.width, buf->vb.height);

		buf->fmt->fourcc, buf->vb.width, buf->vb.height);



	/* packed pixel modes */

	if (buf->fmt->flags & FORMAT_FLAGS_PACKED) {
@@ -860,9 +860,9 @@ bttv_overlay_risc(struct bttv *btv, 
		  struct bttv_buffer *buf)

{

	/* check interleave, bottom+top fields */

	dprintk("%d: overlay fields: %s format: %s  size: %dx%d\n",

	dprintk("%d: overlay fields: %s format: 0x%08x  size: %dx%d\n",

		btv->c.nr, v4l2_field_names[buf->vb.field],

		fmt->name, ov->w.width, ov->w.height);

		fmt->fourcc, ov->w.width, ov->w.height);



	/* calculate geometry */

	bttv_calc_geo(btv,&buf->geo,ov->w.width,ov->w.height,

drivers/media/pci/bt8xx/bttvp.h

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ struct bttv_tvnorm { 
extern const struct bttv_tvnorm bttv_tvnorms[];



struct bttv_format {

	char *name;

	int  fourcc;          /* video4linux 2      */

	int  btformat;        /* BT848_COLOR_FMT_*  */

	int  btswap;          /* BT848_COLOR_CTL_*  */

drivers/media/pci/cobalt/cobalt-v4l2.c

+0 −5
Original line number Diff line number Diff line
@@ -688,15 +688,12 @@ static int cobalt_enum_fmt_vid_cap(struct file *file, void *priv_fh, 
{

	switch (f->index) {

	case 0:

		strscpy(f->description, "YUV 4:2:2", sizeof(f->description));

		f->pixelformat = V4L2_PIX_FMT_YUYV;

		break;

	case 1:

		strscpy(f->description, "RGB24", sizeof(f->description));

		f->pixelformat = V4L2_PIX_FMT_RGB24;

		break;

	case 2:

		strscpy(f->description, "RGB32", sizeof(f->description));

		f->pixelformat = V4L2_PIX_FMT_BGR32;

		break;

	default:
@@ -893,11 +890,9 @@ static int cobalt_enum_fmt_vid_out(struct file *file, void *priv_fh, 
{

	switch (f->index) {

	case 0:

		strscpy(f->description, "YUV 4:2:2", sizeof(f->description));

		f->pixelformat = V4L2_PIX_FMT_YUYV;

		break;

	case 1:

		strscpy(f->description, "RGB32", sizeof(f->description));

		f->pixelformat = V4L2_PIX_FMT_BGR32;

		break;

	default: