diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2019-06-11 09:48:54 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-22 14:01:05 -0400 |
| commit | 009cb7d5794aaf40b037857510c59847298747dd (patch) | |
| tree | d19ba5b440a8ef4c75d81830f22e32e9adffbe21 /drivers/media/usb/tm6000 | |
| parent | 4747bd0f4179858d00498becc3b26c92c8e9724a (diff) | |
| download | linux-stable-009cb7d5794aaf40b037857510c59847298747dd.tar.gz linux-stable-009cb7d5794aaf40b037857510c59847298747dd.tar.bz2 linux-stable-009cb7d5794aaf40b037857510c59847298747dd.zip | |
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>
Diffstat (limited to 'drivers/media/usb/tm6000')
| -rw-r--r-- | drivers/media/usb/tm6000/tm6000-video.c | 4 | ||||
| -rw-r--r-- | drivers/media/usb/tm6000/tm6000.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c index 85fcddfb0202..c07a81a6cbe2 100644 --- a/drivers/media/usb/tm6000/tm6000-video.c +++ b/drivers/media/usb/tm6000/tm6000-video.c @@ -52,15 +52,12 @@ EXPORT_SYMBOL_GPL(tm6000_debug); static struct tm6000_fmt format[] = { { - .name = "4:2:2, packed, YVY2", .fourcc = V4L2_PIX_FMT_YUYV, .depth = 16, }, { - .name = "4:2:2, packed, UYVY", .fourcc = V4L2_PIX_FMT_UYVY, .depth = 16, }, { - .name = "A/V + VBI mux packet", .fourcc = V4L2_PIX_FMT_TM6000, .depth = 16, } @@ -875,7 +872,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, if (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; } diff --git a/drivers/media/usb/tm6000/tm6000.h b/drivers/media/usb/tm6000/tm6000.h index 0864ed7314eb..bf396544da9a 100644 --- a/drivers/media/usb/tm6000/tm6000.h +++ b/drivers/media/usb/tm6000/tm6000.h @@ -64,7 +64,6 @@ struct tm6000_input { */ struct tm6000_fmt { - char *name; u32 fourcc; /* v4l2 format id */ int depth; }; |