mirror of
https://github.com/torvalds/linux.git
synced 2024-12-06 19:11:31 +00:00
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>
This commit is contained in:
parent
38c7c03603
commit
0fda5d4420
@ -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;
|
||||
|
||||
|
@ -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++;
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user