media: Documentation/media: drop/fix vivi references

The vivi.c driver has long gone, but v4l2-videobuf.rst still
refers to it. Just drop that reference since it is no longer valid
or relevant (videobuf is deprecated).

The QUERYCAP documentation also made a reference to is, but there
vivi could just be replaced by vivid, the vivi successor.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/Documentation/driver-api/media/v4l2-videobuf.rst b/Documentation/driver-api/media/v4l2-videobuf.rst
index 1a77563..4b1d84e 100644 (file)
--- a/Documentation/driver-api/media/v4l2-videobuf.rst
+++ b/Documentation/driver-api/media/v4l2-videobuf.rst
@@ -399,8 +399,5 @@ again.
 
 Developers who are interested in more information can go into the relevant
 header files; there are a few low-level functions declared there which have
-not been talked about here.  Also worthwhile is the vivi driver
-(drivers/media/platform/vivi.c), which is maintained as an example of how V4L2
-drivers should be written.  Vivi only uses the vmalloc() API, but it's good
-enough to get started with.  Note also that all of these calls are exported
+not been talked about here.  Note also that all of these calls are exported
 GPL-only, so they will not be available to non-GPL kernel modules.

diff --git a/Documentation/userspace-api/media/v4l/vidioc-querycap.rst b/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
index 4ce8f87..28e1f76 100644 (file)
--- a/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
+++ b/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
@@ -83,7 +83,7 @@ specification the ioctl returns an ``EINVAL`` error code.
        string. For example: "PCI:0000:05:06.0". This information is
        intended for users, to distinguish multiple identical devices. If
        no such information is available the field must simply count the
-       devices controlled by the driver ("platform:vivi-000"). The
+       devices controlled by the driver ("platform:vivid-000"). The
        bus_info must start with "PCI:" for PCI boards, "PCIe:" for PCI
        Express boards, "usb-" for USB devices, "I2C:" for i2c devices,
        "ISA:" for ISA devices, "parport" for parallel port devices and