[PATCH v7 09/17] media: uvcvideo: Set unique vdev name based in type

[Ricardo Ribalda]

All the entities must have a unique name. We can have a descriptive and
unique name by appending the function and the entity->id.

This is even resilent to multi chain devices.

Fixes v4l2-compliance:
Media Controller ioctls:
                fail: v4l2-test-media.cpp(205): v2_entity_names_set.find(key) 
!= v2_entity_names_set.end()
        test MEDIA_IOC_G_TOPOLOGY: FAIL
                fail: v4l2-test-media.cpp(394): num_data_links != num_links
        test MEDIA_IOC_ENUM_ENTITIES/LINKS: FAIL

Signed-off-by: Ricardo Ribalda <riba...@chromium.org>
Reviewed-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
---
 drivers/media/usb/uvc/uvc_driver.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/media/usb/uvc/uvc_driver.c 
b/drivers/media/usb/uvc/uvc_driver.c
index 35873cf2773d..76ab6acecbc9 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2163,6 +2163,7 @@ int uvc_register_video_device(struct uvc_device *dev,
                              const struct v4l2_ioctl_ops *ioctl_ops)
 {
        int ret;
+       const char *name;
 
        /* Initialize the video buffers queue. */
        ret = uvc_queue_init(queue, type, !uvc_no_drop_param);
@@ -2190,16 +2191,20 @@ int uvc_register_video_device(struct uvc_device *dev,
        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
        default:
                vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+               name = "Video Capture";
                break;
        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
                vdev->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
+               name = "Video Output";
                break;
        case V4L2_BUF_TYPE_META_CAPTURE:
                vdev->device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING;
+               name = "Metadata";
                break;
        }
 
-       strscpy(vdev->name, dev->name, sizeof(vdev->name));
+       snprintf(vdev->name, sizeof(vdev->name), "%s %u", name,
+                stream->header.bTerminalLink);
 
        /*
         * Set the driver data before calling video_register_device, otherwise
-- 
2.31.0.rc2.261.g7f71774620-goog