xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések Actions Packages Projektek Kiadások Wiki Tevékenység

media: media/usb: don't set description in ENUM_FMT

Forráskód böngészése 
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>
This commit is contained in:
Hans Verkuil
2019-06-11 09:48:54 -04:00
committed by Mauro Carvalho Chehab
szülő 4747bd0f41
commit 009cb7d579
24 fájl változott, egészen pontosan 14 új sor hozzáadva és 120 régi sor törölve
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/usb/usbvision/usbvision-video.c
Fájl megtekintése

@@ -87,14 +87,14 @@
static int usbvision_nr;
static struct usbvision_v4l2_format_st usbvision_v4l2_format[] = {
{ 1, 1, 8, V4L2_PIX_FMT_GREY , "GREY" },
{ 1, 2, 16, V4L2_PIX_FMT_RGB565 , "RGB565" },
{ 1, 3, 24, V4L2_PIX_FMT_RGB24 , "RGB24" },
{ 1, 4, 32, V4L2_PIX_FMT_RGB32 , "RGB32" },
{ 1, 2, 16, V4L2_PIX_FMT_RGB555 , "RGB555" },
{ 1, 2, 16, V4L2_PIX_FMT_YUYV , "YUV422" },
{ 1, 2, 12, V4L2_PIX_FMT_YVU420 , "YUV420P" }, /* 1.5 ! */
{ 1, 2, 16, V4L2_PIX_FMT_YUV422P , "YUV422P" }
{ 1, 1, 8, V4L2_PIX_FMT_GREY },
{ 1, 2, 16, V4L2_PIX_FMT_RGB565 },
{ 1, 3, 24, V4L2_PIX_FMT_RGB24 },
{ 1, 4, 32, V4L2_PIX_FMT_RGB32 },
{ 1, 2, 16, V4L2_PIX_FMT_RGB555 },
{ 1, 2, 16, V4L2_PIX_FMT_YUYV },
{ 1, 2, 12, V4L2_PIX_FMT_YVU420 }, /* 1.5 ! */
{ 1, 2, 16, V4L2_PIX_FMT_YUV422P }
};
/* Function prototypes */
@@ -796,8 +796,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
{
if (vfd->index >= USBVISION_SUPPORTED_PALETTES - 1)
return -EINVAL;
strscpy(vfd->description, usbvision_v4l2_format[vfd->index].desc,
sizeof(vfd->description));
vfd->pixelformat = usbvision_v4l2_format[vfd->index].format;
return 0;
}

1
drivers/media/usb/usbvision/usbvision.h
Fájl megtekintése

@@ -264,7 +264,6 @@ struct usbvision_v4l2_format_st {
int bytes_per_pixel;
int depth;
int format;
char *desc;
};
#define USBVISION_SUPPORTED_PALETTES ARRAY_SIZE(usbvision_v4l2_format)