iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2009-11-27 13:57:18 -03:00 committed by Mauro Carvalho Chehab
parent 38c7c03603
commit 0fda5d4420
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/usbvision/usbvision-i2c.c
View File

@ -215,8 +215,8 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
memcpy(&usbvision->i2c_adap, &i2c_adap_template, memcpy(&usbvision->i2c_adap, &i2c_adap_template,
sizeof(struct i2c_adapter)); sizeof(struct i2c_adapter));
sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name), sprintf(usbvision->i2c_adap.name, "%s-%d-%s", i2c_adap_template.name,
" #%d", usbvision->vdev->num); usbvision->dev->bus->busnum, usbvision->dev->devpath);
PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name); PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name);
usbvision->i2c_adap.dev.parent = &usbvision->dev->dev; usbvision->i2c_adap.dev.parent = &usbvision->dev->dev;

3
drivers/media/video/vivi.c
View File

@ -1373,9 +1373,6 @@ static int __init vivi_create_instance(int inst)
/* Now that everything is fine, let's add it to device list */ /* Now that everything is fine, let's add it to device list */
list_add_tail(&dev->vivi_devlist, &vivi_devlist); 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) if (video_nr >= 0)
video_nr++; video_nr++;

3
drivers/media/video/w9968cf.c
View File

@ -2877,8 +2877,7 @@ static long w9968cf_v4l_ioctl(struct file *filp,
.minwidth = cam->minwidth, .minwidth = cam->minwidth,
.minheight = cam->minheight, .minheight = cam->minheight,
}; };
sprintf(cap.name, "W996[87]CF USB Camera #%d", sprintf(cap.name, "W996[87]CF USB Camera");
cam->v4ldev->num);
cap.maxwidth = (cam->upscaling && w9968cf_vpp) cap.maxwidth = (cam->upscaling && w9968cf_vpp)
? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth) ? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth)
: cam->maxwidth; : cam->maxwidth;