media: media/usb: don't set description in 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: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
此提交包含在:
@@ -102,37 +102,30 @@ MODULE_PARM_DESC(video_debug, "enable debug messages [video]");
|
||||
/* supported video standards */
|
||||
static struct em28xx_fmt format[] = {
|
||||
{
|
||||
.name = "16 bpp YUY2, 4:2:2, packed",
|
||||
.fourcc = V4L2_PIX_FMT_YUYV,
|
||||
.depth = 16,
|
||||
.reg = EM28XX_OUTFMT_YUV422_Y0UY1V,
|
||||
}, {
|
||||
.name = "16 bpp RGB 565, LE",
|
||||
.fourcc = V4L2_PIX_FMT_RGB565,
|
||||
.depth = 16,
|
||||
.reg = EM28XX_OUTFMT_RGB_16_656,
|
||||
}, {
|
||||
.name = "8 bpp Bayer RGRG..GBGB",
|
||||
.fourcc = V4L2_PIX_FMT_SRGGB8,
|
||||
.depth = 8,
|
||||
.reg = EM28XX_OUTFMT_RGB_8_RGRG,
|
||||
}, {
|
||||
.name = "8 bpp Bayer BGBG..GRGR",
|
||||
.fourcc = V4L2_PIX_FMT_SBGGR8,
|
||||
.depth = 8,
|
||||
.reg = EM28XX_OUTFMT_RGB_8_BGBG,
|
||||
}, {
|
||||
.name = "8 bpp Bayer GRGR..BGBG",
|
||||
.fourcc = V4L2_PIX_FMT_SGRBG8,
|
||||
.depth = 8,
|
||||
.reg = EM28XX_OUTFMT_RGB_8_GRGR,
|
||||
}, {
|
||||
.name = "8 bpp Bayer GBGB..RGRG",
|
||||
.fourcc = V4L2_PIX_FMT_SGBRG8,
|
||||
.depth = 8,
|
||||
.reg = EM28XX_OUTFMT_RGB_8_GBGB,
|
||||
}, {
|
||||
.name = "12 bpp YUV411",
|
||||
.fourcc = V4L2_PIX_FMT_YUV411P,
|
||||
.depth = 12,
|
||||
.reg = EM28XX_OUTFMT_YUV411,
|
||||
@@ -2011,7 +2004,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
|
||||
if (unlikely(f->index >= ARRAY_SIZE(format)))
|
||||
return -EINVAL;
|
||||
|
||||
strscpy(f->description, format[f->index].name, sizeof(f->description));
|
||||
f->pixelformat = format[f->index].fourcc;
|
||||
|
||||
return 0;
|
||||
|
@@ -251,13 +251,11 @@ struct em28xx_usb_ctl {
|
||||
/**
|
||||
* struct em28xx_fmt - Struct to enumberate video formats
|
||||
*
|
||||
* @name: Name for the video standard
|
||||
* @fourcc: v4l2 format id
|
||||
* @depth: mean number of bits to represent a pixel
|
||||
* @reg: em28xx register value to set it
|
||||
*/
|
||||
struct em28xx_fmt {
|
||||
char *name;
|
||||
u32 fourcc;
|
||||
int depth;
|
||||
int reg;
|
||||
|
新增問題並參考
封鎖使用者