V4L/DVB (13551): v4l: Remove video_device::num usage from device drivers

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 3 insertions, 7 deletions

diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index c19f51dba2ee..0613922997e0 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -215,8 +215,8 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
         memcpy(&usbvision->i2c_adap, &i2c_adap_template,
                sizeof(struct i2c_adapter));
 
-        sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name),
-                " #%d", usbvision->vdev->num);
+        sprintf(usbvision->i2c_adap.name, "%s-%d-%s", i2c_adap_template.name,
+                usbvision->dev->bus->busnum, usbvision->dev->devpath);
         PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name);
         usbvision->i2c_adap.dev.parent = &usbvision->dev->dev;
 
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 48f5a628c065..93e0a258080d 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1373,9 +1373,6 @@ static int __init vivi_create_instance(int inst)
         /* Now that everything is fine, let's add it to device list */
         list_add_tail(&dev->vivi_devlist, &vivi_devlist);
 
-        snprintf(vfd->name, sizeof(vfd->name), "%s (%i)",
-                        vivi_template.name, vfd->num);
-
         if (video_nr >= 0)
                 video_nr++;
 
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index 695ad2f46095..3af6d6b31865 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -2877,8 +2877,7 @@ static long w9968cf_v4l_ioctl(struct file *filp,
                         .minwidth = cam->minwidth,
                         .minheight = cam->minheight,
                 };
-                sprintf(cap.name, "W996[87]CF USB Camera #%d",
-                        cam->v4ldev->num);
+                sprintf(cap.name, "W996[87]CF USB Camera");
                 cap.maxwidth = (cam->upscaling && w9968cf_vpp)
                                ? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth)
                                  : cam->maxwidth;