Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fda5d44 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 38c7c036

drivers/media/video/usbvision/usbvision-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/vivi.c

+0 −3
Original line number Diff line number Diff line
@@ -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++;

drivers/media/video/w9968cf.c

+1 −2
Original line number Diff line number Diff line
@@ -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;