aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-10-19 17:54:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 12:31:37 -0400
commitc6330fb86fd0fed98b7e0d5792881a77b778fefc (patch)
tree3c87d6fa7053963cfdea592a2956b28354ce0832 /drivers
parent323a491a29d0bb1e91263ca347cb42c4de28adfc (diff)
V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d
The kernel number of a v4l2 node (e.g. videoX, radioX or vbiX) is now independent of the minor number. So instead of using the minor field of the video_device struct one has to use the num field: this always contains the kernel number of the device node. I forgot about this when I did the v4l2 core change, so this patch converts all drivers that use it in one go. Luckily the change is trivial. Cc: michael@mihu.de Cc: mchehab@infradead.org Cc: corbet@lwn.net Cc: luca.risolia@studio.unibo.it Cc: isely@pobox.com Cc: pe1rxq@amsat.org Cc: royale@zerezo.com Cc: mkrufky@linuxtv.org Cc: stoth@linuxtv.org Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/saa7146_fops.c4
-rw-r--r--drivers/media/video/arv.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c6
-rw-r--r--drivers/media/video/c-qcam.c2
-rw-r--r--drivers/media/video/cafe_ccic.c4
-rw-r--r--drivers/media/video/cpia.c6
-rw-r--r--drivers/media/video/cpia2/cpia2_v4l.c2
-rw-r--r--drivers/media/video/cx23885/cx23885-417.c2
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c2
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c2
-rw-r--r--drivers/media/video/cx88/cx88-video.c6
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c2
-rw-r--r--drivers/media/video/et61x251/et61x251_core.c24
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-v4l2.c6
-rw-r--r--drivers/media/video/pwc/pwc-if.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c6
-rw-r--r--drivers/media/video/saa7134/saa7134-empress.c2
-rw-r--r--drivers/media/video/se401.c2
-rw-r--r--drivers/media/video/sn9c102/sn9c102_core.c24
-rw-r--r--drivers/media/video/stk-webcam.c4
-rw-r--r--drivers/media/video/stv680.c3
-rw-r--r--drivers/media/video/usbvideo/usbvideo.c2
-rw-r--r--drivers/media/video/usbvideo/vicam.c3
-rw-r--r--drivers/media/video/usbvision/usbvision-i2c.c2
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c12
-rw-r--r--drivers/media/video/vivi.c6
-rw-r--r--drivers/media/video/w9968cf.c16
-rw-r--r--drivers/media/video/zc0301/zc0301_core.c24
-rw-r--r--drivers/media/video/zr364xx.c2
29 files changed, 91 insertions, 89 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 5b34c134aa25..127b0526a727 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -545,11 +545,11 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
545 if( VFL_TYPE_GRABBER == type ) { 545 if( VFL_TYPE_GRABBER == type ) {
546 vv->video_minor = vfd->minor; 546 vv->video_minor = vfd->minor;
547 INFO(("%s: registered device video%d [v4l2]\n", 547 INFO(("%s: registered device video%d [v4l2]\n",
548 dev->name, vfd->minor & 0x1f)); 548 dev->name, vfd->num));
549 } else { 549 } else {
550 vv->vbi_minor = vfd->minor; 550 vv->vbi_minor = vfd->minor;
551 INFO(("%s: registered device vbi%d [v4l2]\n", 551 INFO(("%s: registered device vbi%d [v4l2]\n",
552 dev->name, vfd->minor & 0x1f)); 552 dev->name, vfd->num));
553 } 553 }
554 554
555 *vid = vfd; 555 *vid = vfd;
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 218754b4906a..e09b00693230 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -866,7 +866,7 @@ static int __init ar_init(void)
866 } 866 }
867 867
868 printk("video%d: Found M64278 VGA (IRQ %d, Freq %dMHz).\n", 868 printk("video%d: Found M64278 VGA (IRQ %d, Freq %dMHz).\n",
869 ar->vdev->minor, M32R_IRQ_INT3, freq); 869 ar->vdev->num, M32R_IRQ_INT3, freq);
870 870
871 return 0; 871 return 0;
872 872
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 5858bf5ff41c..9ec4cec2e52d 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -4246,7 +4246,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
4246 video_nr[btv->c.nr]) < 0) 4246 video_nr[btv->c.nr]) < 0)
4247 goto err; 4247 goto err;
4248 printk(KERN_INFO "bttv%d: registered device video%d\n", 4248 printk(KERN_INFO "bttv%d: registered device video%d\n",
4249 btv->c.nr,btv->video_dev->minor & 0x1f); 4249 btv->c.nr, btv->video_dev->num);
4250 if (device_create_file(&btv->video_dev->dev, 4250 if (device_create_file(&btv->video_dev->dev,
4251 &dev_attr_card)<0) { 4251 &dev_attr_card)<0) {
4252 printk(KERN_ERR "bttv%d: device_create_file 'card' " 4252 printk(KERN_ERR "bttv%d: device_create_file 'card' "
@@ -4263,7 +4263,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
4263 vbi_nr[btv->c.nr]) < 0) 4263 vbi_nr[btv->c.nr]) < 0)
4264 goto err; 4264 goto err;
4265 printk(KERN_INFO "bttv%d: registered device vbi%d\n", 4265 printk(KERN_INFO "bttv%d: registered device vbi%d\n",
4266 btv->c.nr,btv->vbi_dev->minor & 0x1f); 4266 btv->c.nr, btv->vbi_dev->num);
4267 4267
4268 if (!btv->has_radio) 4268 if (!btv->has_radio)
4269 return 0; 4269 return 0;
@@ -4275,7 +4275,7 @@ static int __devinit bttv_register_video(struct bttv *btv)
4275 radio_nr[btv->c.nr]) < 0) 4275 radio_nr[btv->c.nr]) < 0)
4276 goto err; 4276 goto err;
4277 printk(KERN_INFO "bttv%d: registered device radio%d\n", 4277 printk(KERN_INFO "bttv%d: registered device radio%d\n",
4278 btv->c.nr,btv->radio_dev->minor & 0x1f); 4278 btv->c.nr, btv->radio_dev->num);
4279 4279
4280 /* all done */ 4280 /* all done */
4281 return 0; 4281 return 0;
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 17aa0adb3467..0f930d351466 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -815,7 +815,7 @@ static int init_cqcam(struct parport *port)
815 } 815 }
816 816
817 printk(KERN_INFO "video%d: Colour QuickCam found on %s\n", 817 printk(KERN_INFO "video%d: Colour QuickCam found on %s\n",
818 qcam->vdev.minor, qcam->pport->name); 818 qcam->vdev.num, qcam->pport->name);
819 819
820 qcams[num_cams++] = qcam; 820 qcams[num_cams++] = qcam;
821 821
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index fc9497bdd322..a8c068e1de1c 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -2059,10 +2059,10 @@ static void cafe_dfs_cam_setup(struct cafe_camera *cam)
2059 2059
2060 if (!cafe_dfs_root) 2060 if (!cafe_dfs_root)
2061 return; 2061 return;
2062 sprintf(fname, "regs-%d", cam->v4ldev.minor); 2062 sprintf(fname, "regs-%d", cam->v4ldev.num);
2063 cam->dfs_regs = debugfs_create_file(fname, 0444, cafe_dfs_root, 2063 cam->dfs_regs = debugfs_create_file(fname, 0444, cafe_dfs_root,
2064 cam, &cafe_dfs_reg_ops); 2064 cam, &cafe_dfs_reg_ops);
2065 sprintf(fname, "cam-%d", cam->v4ldev.minor); 2065 sprintf(fname, "cam-%d", cam->v4ldev.num);
2066 cam->dfs_cam_regs = debugfs_create_file(fname, 0444, cafe_dfs_root, 2066 cam->dfs_cam_regs = debugfs_create_file(fname, 0444, cafe_dfs_root,
2067 cam, &cafe_dfs_cam_ops); 2067 cam, &cafe_dfs_cam_ops);
2068} 2068}
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 1798b779a25a..16c094f77852 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -1347,7 +1347,7 @@ static void create_proc_cpia_cam(struct cam_data *cam)
1347 if (!cpia_proc_root || !cam) 1347 if (!cpia_proc_root || !cam)
1348 return; 1348 return;
1349 1349
1350 snprintf(name, sizeof(name), "video%d", cam->vdev.minor); 1350 snprintf(name, sizeof(name), "video%d", cam->vdev.num);
1351 1351
1352 ent = create_proc_entry(name, S_IFREG|S_IRUGO|S_IWUSR, cpia_proc_root); 1352 ent = create_proc_entry(name, S_IFREG|S_IRUGO|S_IWUSR, cpia_proc_root);
1353 if (!ent) 1353 if (!ent)
@@ -1372,7 +1372,7 @@ static void destroy_proc_cpia_cam(struct cam_data *cam)
1372 if (!cam || !cam->proc_entry) 1372 if (!cam || !cam->proc_entry)
1373 return; 1373 return;
1374 1374
1375 snprintf(name, sizeof(name), "video%d", cam->vdev.minor); 1375 snprintf(name, sizeof(name), "video%d", cam->vdev.num);
1376 remove_proc_entry(name, cpia_proc_root); 1376 remove_proc_entry(name, cpia_proc_root);
1377 cam->proc_entry = NULL; 1377 cam->proc_entry = NULL;
1378} 1378}
@@ -4005,7 +4005,7 @@ void cpia_unregister_camera(struct cam_data *cam)
4005 } 4005 }
4006 4006
4007#ifdef CONFIG_PROC_FS 4007#ifdef CONFIG_PROC_FS
4008 DBG("destroying /proc/cpia/video%d\n", cam->vdev.minor); 4008 DBG("destroying /proc/cpia/video%d\n", cam->vdev.num);
4009 destroy_proc_cpia_cam(cam); 4009 destroy_proc_cpia_cam(cam);
4010#endif 4010#endif
4011 if (!cam->open_count) { 4011 if (!cam->open_count) {
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 897e8d1a5c3c..1c6bd633f193 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -1973,7 +1973,7 @@ void cpia2_unregister_camera(struct camera_data *cam)
1973 } else { 1973 } else {
1974 LOG("/dev/video%d removed while open, " 1974 LOG("/dev/video%d removed while open, "
1975 "deferring video_unregister_device\n", 1975 "deferring video_unregister_device\n",
1976 cam->vdev->minor); 1976 cam->vdev->num);
1977 } 1977 }
1978} 1978}
1979 1979
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 395c11fa47ce..00831f3ef8f5 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1815,7 +1815,7 @@ int cx23885_417_register(struct cx23885_dev *dev)
1815 cx23885_mc417_init(dev); 1815 cx23885_mc417_init(dev);
1816 1816
1817 printk(KERN_INFO "%s: registered device video%d [mpeg]\n", 1817 printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
1818 dev->name, dev->v4l_device->minor & 0x1f); 1818 dev->name, dev->v4l_device->num);
1819 1819
1820 return 0; 1820 return 0;
1821} 1821}
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index ab3110d6046c..c742a10be5cb 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -1543,7 +1543,7 @@ int cx23885_video_register(struct cx23885_dev *dev)
1543 goto fail_unreg; 1543 goto fail_unreg;
1544 } 1544 }
1545 printk(KERN_INFO "%s/0: registered device video%d [v4l2]\n", 1545 printk(KERN_INFO "%s/0: registered device video%d [v4l2]\n",
1546 dev->name, dev->video_dev->minor & 0x1f); 1546 dev->name, dev->video_dev->num);
1547 /* initial device configuration */ 1547 /* initial device configuration */
1548 mutex_lock(&dev->lock); 1548 mutex_lock(&dev->lock);
1549 cx23885_set_tvnorm(dev, dev->tvnorm); 1549 cx23885_set_tvnorm(dev, dev->tvnorm);
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index e71369754305..078be6319556 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1285,7 +1285,7 @@ static int blackbird_register_video(struct cx8802_dev *dev)
1285 return err; 1285 return err;
1286 } 1286 }
1287 printk(KERN_INFO "%s/2: registered device video%d [mpeg]\n", 1287 printk(KERN_INFO "%s/2: registered device video%d [mpeg]\n",
1288 dev->core->name,dev->mpeg_dev->minor & 0x1f); 1288 dev->core->name, dev->mpeg_dev->num);
1289 return 0; 1289 return 0;
1290} 1290}
1291 1291
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 3904b73f52ee..61265fd04d56 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1911,7 +1911,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1911 goto fail_unreg; 1911 goto fail_unreg;
1912 } 1912 }
1913 printk(KERN_INFO "%s/0: registered device video%d [v4l2]\n", 1913 printk(KERN_INFO "%s/0: registered device video%d [v4l2]\n",
1914 core->name,dev->video_dev->minor & 0x1f); 1914 core->name, dev->video_dev->num);
1915 1915
1916 dev->vbi_dev = cx88_vdev_init(core,dev->pci,&cx8800_vbi_template,"vbi"); 1916 dev->vbi_dev = cx88_vdev_init(core,dev->pci,&cx8800_vbi_template,"vbi");
1917 err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, 1917 err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
@@ -1922,7 +1922,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1922 goto fail_unreg; 1922 goto fail_unreg;
1923 } 1923 }
1924 printk(KERN_INFO "%s/0: registered device vbi%d\n", 1924 printk(KERN_INFO "%s/0: registered device vbi%d\n",
1925 core->name,dev->vbi_dev->minor & 0x1f); 1925 core->name, dev->vbi_dev->num);
1926 1926
1927 if (core->board.radio.type == CX88_RADIO) { 1927 if (core->board.radio.type == CX88_RADIO) {
1928 dev->radio_dev = cx88_vdev_init(core,dev->pci, 1928 dev->radio_dev = cx88_vdev_init(core,dev->pci,
@@ -1935,7 +1935,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
1935 goto fail_unreg; 1935 goto fail_unreg;
1936 } 1936 }
1937 printk(KERN_INFO "%s/0: registered device radio%d\n", 1937 printk(KERN_INFO "%s/0: registered device radio%d\n",
1938 core->name,dev->radio_dev->minor & 0x1f); 1938 core->name, dev->radio_dev->num);
1939 } 1939 }
1940 1940
1941 /* everything worked */ 1941 /* everything worked */
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index c53649e5315b..a1ab2ef45578 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2042,7 +2042,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
2042 goto fail_unreg; 2042 goto fail_unreg;
2043 } 2043 }
2044 em28xx_info("Registered radio device as /dev/radio%d\n", 2044 em28xx_info("Registered radio device as /dev/radio%d\n",
2045 dev->radio_dev->minor & 0x1f); 2045 dev->radio_dev->num);
2046 } 2046 }
2047 2047
2048 /* init video dma queues */ 2048 /* init video dma queues */
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 7a85c41b0eea..9d0ef96c23ff 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -588,7 +588,7 @@ static int et61x251_stream_interrupt(struct et61x251_device* cam)
588 cam->state |= DEV_MISCONFIGURED; 588 cam->state |= DEV_MISCONFIGURED;
589 DBG(1, "URB timeout reached. The camera is misconfigured. To " 589 DBG(1, "URB timeout reached. The camera is misconfigured. To "
590 "use it, close and open /dev/video%d again.", 590 "use it, close and open /dev/video%d again.",
591 cam->v4ldev->minor); 591 cam->v4ldev->num);
592 return -EIO; 592 return -EIO;
593 } 593 }
594 594
@@ -1195,7 +1195,7 @@ static void et61x251_release_resources(struct kref *kref)
1195 1195
1196 cam = container_of(kref, struct et61x251_device, kref); 1196 cam = container_of(kref, struct et61x251_device, kref);
1197 1197
1198 DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor); 1198 DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->num);
1199 video_set_drvdata(cam->v4ldev, NULL); 1199 video_set_drvdata(cam->v4ldev, NULL);
1200 video_unregister_device(cam->v4ldev); 1200 video_unregister_device(cam->v4ldev);
1201 usb_put_dev(cam->usbdev); 1201 usb_put_dev(cam->usbdev);
@@ -1237,7 +1237,7 @@ static int et61x251_open(struct inode* inode, struct file* filp)
1237 1237
1238 if (cam->users) { 1238 if (cam->users) {
1239 DBG(2, "Device /dev/video%d is already in use", 1239 DBG(2, "Device /dev/video%d is already in use",
1240 cam->v4ldev->minor); 1240 cam->v4ldev->num);
1241 DBG(3, "Simultaneous opens are not supported"); 1241 DBG(3, "Simultaneous opens are not supported");
1242 if ((filp->f_flags & O_NONBLOCK) || 1242 if ((filp->f_flags & O_NONBLOCK) ||
1243 (filp->f_flags & O_NDELAY)) { 1243 (filp->f_flags & O_NDELAY)) {
@@ -1280,7 +1280,7 @@ static int et61x251_open(struct inode* inode, struct file* filp)
1280 cam->frame_count = 0; 1280 cam->frame_count = 0;
1281 et61x251_empty_framequeues(cam); 1281 et61x251_empty_framequeues(cam);
1282 1282
1283 DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor); 1283 DBG(3, "Video device /dev/video%d is open", cam->v4ldev->num);
1284 1284
1285out: 1285out:
1286 mutex_unlock(&cam->open_mutex); 1286 mutex_unlock(&cam->open_mutex);
@@ -1304,7 +1304,7 @@ static int et61x251_release(struct inode* inode, struct file* filp)
1304 cam->users--; 1304 cam->users--;
1305 wake_up_interruptible_nr(&cam->wait_open, 1); 1305 wake_up_interruptible_nr(&cam->wait_open, 1);
1306 1306
1307 DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor); 1307 DBG(3, "Video device /dev/video%d closed", cam->v4ldev->num);
1308 1308
1309 kref_put(&cam->kref, et61x251_release_resources); 1309 kref_put(&cam->kref, et61x251_release_resources);
1310 1310
@@ -1845,7 +1845,7 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
1845 cam->state |= DEV_MISCONFIGURED; 1845 cam->state |= DEV_MISCONFIGURED;
1846 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To " 1846 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
1847 "use the camera, close and open /dev/video%d again.", 1847 "use the camera, close and open /dev/video%d again.",
1848 cam->v4ldev->minor); 1848 cam->v4ldev->num);
1849 return -EIO; 1849 return -EIO;
1850 } 1850 }
1851 1851
@@ -1858,7 +1858,7 @@ et61x251_vidioc_s_crop(struct et61x251_device* cam, void __user * arg)
1858 cam->state |= DEV_MISCONFIGURED; 1858 cam->state |= DEV_MISCONFIGURED;
1859 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To " 1859 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
1860 "use the camera, close and open /dev/video%d again.", 1860 "use the camera, close and open /dev/video%d again.",
1861 cam->v4ldev->minor); 1861 cam->v4ldev->num);
1862 return -ENOMEM; 1862 return -ENOMEM;
1863 } 1863 }
1864 1864
@@ -2068,7 +2068,7 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
2068 cam->state |= DEV_MISCONFIGURED; 2068 cam->state |= DEV_MISCONFIGURED;
2069 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To " 2069 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
2070 "use the camera, close and open /dev/video%d again.", 2070 "use the camera, close and open /dev/video%d again.",
2071 cam->v4ldev->minor); 2071 cam->v4ldev->num);
2072 return -EIO; 2072 return -EIO;
2073 } 2073 }
2074 2074
@@ -2080,7 +2080,7 @@ et61x251_vidioc_try_s_fmt(struct et61x251_device* cam, unsigned int cmd,
2080 cam->state |= DEV_MISCONFIGURED; 2080 cam->state |= DEV_MISCONFIGURED;
2081 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To " 2081 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
2082 "use the camera, close and open /dev/video%d again.", 2082 "use the camera, close and open /dev/video%d again.",
2083 cam->v4ldev->minor); 2083 cam->v4ldev->num);
2084 return -ENOMEM; 2084 return -ENOMEM;
2085 } 2085 }
2086 2086
@@ -2128,7 +2128,7 @@ et61x251_vidioc_s_jpegcomp(struct et61x251_device* cam, void __user * arg)
2128 cam->state |= DEV_MISCONFIGURED; 2128 cam->state |= DEV_MISCONFIGURED;
2129 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware " 2129 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
2130 "problems. To use the camera, close and open " 2130 "problems. To use the camera, close and open "
2131 "/dev/video%d again.", cam->v4ldev->minor); 2131 "/dev/video%d again.", cam->v4ldev->num);
2132 return -EIO; 2132 return -EIO;
2133 } 2133 }
2134 2134
@@ -2605,7 +2605,7 @@ et61x251_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
2605 goto fail; 2605 goto fail;
2606 } 2606 }
2607 2607
2608 DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor); 2608 DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->num);
2609 2609
2610 cam->module_param.force_munmap = force_munmap[dev_nr]; 2610 cam->module_param.force_munmap = force_munmap[dev_nr];
2611 cam->module_param.frame_timeout = frame_timeout[dev_nr]; 2611 cam->module_param.frame_timeout = frame_timeout[dev_nr];
@@ -2658,7 +2658,7 @@ static void et61x251_usb_disconnect(struct usb_interface* intf)
2658 if (cam->users) { 2658 if (cam->users) {
2659 DBG(2, "Device /dev/video%d is open! Deregistration and " 2659 DBG(2, "Device /dev/video%d is open! Deregistration and "
2660 "memory deallocation are deferred.", 2660 "memory deallocation are deferred.",
2661 cam->v4ldev->minor); 2661 cam->v4ldev->num);
2662 cam->state |= DEV_MISCONFIGURED; 2662 cam->state |= DEV_MISCONFIGURED;
2663 et61x251_stop_transfer(cam); 2663 et61x251_stop_transfer(cam);
2664 cam->state |= DEV_DISCONNECTED; 2664 cam->state |= DEV_DISCONNECTED;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index f048d80b77e5..43ef7ba75c8b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -893,7 +893,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
893 893
894static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) 894static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
895{ 895{
896 int minor_id = dip->devbase.minor; 896 int num = dip->devbase.num;
897 struct pvr2_hdw *hdw = dip->v4lp->channel.mc_head->hdw; 897 struct pvr2_hdw *hdw = dip->v4lp->channel.mc_head->hdw;
898 enum pvr2_config cfg = dip->config; 898 enum pvr2_config cfg = dip->config;
899 int v4l_type = dip->v4l_type; 899 int v4l_type = dip->v4l_type;
@@ -909,7 +909,7 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
909 video_unregister_device(&dip->devbase); 909 video_unregister_device(&dip->devbase);
910 910
911 printk(KERN_INFO "pvrusb2: unregistered device %s%u [%s]\n", 911 printk(KERN_INFO "pvrusb2: unregistered device %s%u [%s]\n",
912 get_v4l_name(v4l_type),minor_id & 0x1f, 912 get_v4l_name(v4l_type), num,
913 pvr2_config_get_name(cfg)); 913 pvr2_config_get_name(cfg));
914 914
915} 915}
@@ -1310,7 +1310,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
1310 } 1310 }
1311 1311
1312 printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n", 1312 printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n",
1313 get_v4l_name(dip->v4l_type),dip->devbase.minor & 0x1f, 1313 get_v4l_name(dip->v4l_type), dip->devbase.num,
1314 pvr2_config_get_name(dip->config)); 1314 pvr2_config_get_name(dip->config));
1315 1315
1316 pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw, 1316 pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index ab28389b4cda..f3897a3fdb75 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1795,7 +1795,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
1795 goto err; 1795 goto err;
1796 } 1796 }
1797 else { 1797 else {
1798 PWC_INFO("Registered as /dev/video%d.\n", pdev->vdev->minor & 0x3F); 1798 PWC_INFO("Registered as /dev/video%d.\n", pdev->vdev->num);
1799 } 1799 }
1800 1800
1801 /* occupy slot */ 1801 /* occupy slot */
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index b686bfabbde0..249184452949 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -996,7 +996,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
996 goto fail4; 996 goto fail4;
997 } 997 }
998 printk(KERN_INFO "%s: registered device video%d [v4l2]\n", 998 printk(KERN_INFO "%s: registered device video%d [v4l2]\n",
999 dev->name,dev->video_dev->minor & 0x1f); 999 dev->name, dev->video_dev->num);
1000 1000
1001 dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi"); 1001 dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi");
1002 1002
@@ -1005,7 +1005,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
1005 if (err < 0) 1005 if (err < 0)
1006 goto fail4; 1006 goto fail4;
1007 printk(KERN_INFO "%s: registered device vbi%d\n", 1007 printk(KERN_INFO "%s: registered device vbi%d\n",
1008 dev->name,dev->vbi_dev->minor & 0x1f); 1008 dev->name, dev->vbi_dev->num);
1009 1009
1010 if (card_has_radio(dev)) { 1010 if (card_has_radio(dev)) {
1011 dev->radio_dev = vdev_init(dev,&saa7134_radio_template,"radio"); 1011 dev->radio_dev = vdev_init(dev,&saa7134_radio_template,"radio");
@@ -1014,7 +1014,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
1014 if (err < 0) 1014 if (err < 0)
1015 goto fail4; 1015 goto fail4;
1016 printk(KERN_INFO "%s: registered device radio%d\n", 1016 printk(KERN_INFO "%s: registered device radio%d\n",
1017 dev->name,dev->radio_dev->minor & 0x1f); 1017 dev->name, dev->radio_dev->num);
1018 } 1018 }
1019 1019
1020 /* everything worked */ 1020 /* everything worked */
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 9a8766a78a0c..7f40511bcc04 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -534,7 +534,7 @@ static int empress_init(struct saa7134_dev *dev)
534 return err; 534 return err;
535 } 535 }
536 printk(KERN_INFO "%s: registered device video%d [mpeg]\n", 536 printk(KERN_INFO "%s: registered device video%d [mpeg]\n",
537 dev->name,dev->empress_dev->minor & 0x1f); 537 dev->name, dev->empress_dev->num);
538 538
539 videobuf_queue_sg_init(&dev->empress_tsq, &saa7134_ts_qops, 539 videobuf_queue_sg_init(&dev->empress_tsq, &saa7134_ts_qops,
540 &dev->pci->dev, &dev->slock, 540 &dev->pci->dev, &dev->slock,
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index ae3949180c4e..044a2e94c34d 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -1412,7 +1412,7 @@ static int se401_probe(struct usb_interface *intf,
1412 return -EIO; 1412 return -EIO;
1413 } 1413 }
1414 dev_info(&intf->dev, "registered new video device: video%d\n", 1414 dev_info(&intf->dev, "registered new video device: video%d\n",
1415 se401->vdev.minor); 1415 se401->vdev.num);
1416 1416
1417 usb_set_intfdata (intf, se401); 1417 usb_set_intfdata (intf, se401);
1418 return 0; 1418 return 0;
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 20e30bd9364b..fcd2b62f92c4 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -1008,7 +1008,7 @@ static int sn9c102_stream_interrupt(struct sn9c102_device* cam)
1008 cam->state |= DEV_MISCONFIGURED; 1008 cam->state |= DEV_MISCONFIGURED;
1009 DBG(1, "URB timeout reached. The camera is misconfigured. " 1009 DBG(1, "URB timeout reached. The camera is misconfigured. "
1010 "To use it, close and open /dev/video%d again.", 1010 "To use it, close and open /dev/video%d again.",
1011 cam->v4ldev->minor); 1011 cam->v4ldev->num);
1012 return -EIO; 1012 return -EIO;
1013 } 1013 }
1014 1014
@@ -1734,7 +1734,7 @@ static void sn9c102_release_resources(struct kref *kref)
1734 1734
1735 cam = container_of(kref, struct sn9c102_device, kref); 1735 cam = container_of(kref, struct sn9c102_device, kref);
1736 1736
1737 DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor); 1737 DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->num);
1738 video_set_drvdata(cam->v4ldev, NULL); 1738 video_set_drvdata(cam->v4ldev, NULL);
1739 video_unregister_device(cam->v4ldev); 1739 video_unregister_device(cam->v4ldev);
1740 usb_put_dev(cam->usbdev); 1740 usb_put_dev(cam->usbdev);
@@ -1792,7 +1792,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
1792 1792
1793 if (cam->users) { 1793 if (cam->users) {
1794 DBG(2, "Device /dev/video%d is already in use", 1794 DBG(2, "Device /dev/video%d is already in use",
1795 cam->v4ldev->minor); 1795 cam->v4ldev->num);
1796 DBG(3, "Simultaneous opens are not supported"); 1796 DBG(3, "Simultaneous opens are not supported");
1797 /* 1797 /*
1798 open() must follow the open flags and should block 1798 open() must follow the open flags and should block
@@ -1845,7 +1845,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
1845 cam->frame_count = 0; 1845 cam->frame_count = 0;
1846 sn9c102_empty_framequeues(cam); 1846 sn9c102_empty_framequeues(cam);
1847 1847
1848 DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor); 1848 DBG(3, "Video device /dev/video%d is open", cam->v4ldev->num);
1849 1849
1850out: 1850out:
1851 mutex_unlock(&cam->open_mutex); 1851 mutex_unlock(&cam->open_mutex);
@@ -1870,7 +1870,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)
1870 cam->users--; 1870 cam->users--;
1871 wake_up_interruptible_nr(&cam->wait_open, 1); 1871 wake_up_interruptible_nr(&cam->wait_open, 1);
1872 1872
1873 DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor); 1873 DBG(3, "Video device /dev/video%d closed", cam->v4ldev->num);
1874 1874
1875 kref_put(&cam->kref, sn9c102_release_resources); 1875 kref_put(&cam->kref, sn9c102_release_resources);
1876 1876
@@ -2432,7 +2432,7 @@ sn9c102_vidioc_s_crop(struct sn9c102_device* cam, void __user * arg)
2432 cam->state |= DEV_MISCONFIGURED; 2432 cam->state |= DEV_MISCONFIGURED;
2433 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To " 2433 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
2434 "use the camera, close and open /dev/video%d again.", 2434 "use the camera, close and open /dev/video%d again.",
2435 cam->v4ldev->minor); 2435 cam->v4ldev->num);
2436 return -EIO; 2436 return -EIO;
2437 } 2437 }
2438 2438
@@ -2445,7 +2445,7 @@ sn9c102_vidioc_s_crop(struct sn9c102_device* cam, void __user * arg)
2445 cam->state |= DEV_MISCONFIGURED; 2445 cam->state |= DEV_MISCONFIGURED;
2446 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To " 2446 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
2447 "use the camera, close and open /dev/video%d again.", 2447 "use the camera, close and open /dev/video%d again.",
2448 cam->v4ldev->minor); 2448 cam->v4ldev->num);
2449 return -ENOMEM; 2449 return -ENOMEM;
2450 } 2450 }
2451 2451
@@ -2689,7 +2689,7 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
2689 cam->state |= DEV_MISCONFIGURED; 2689 cam->state |= DEV_MISCONFIGURED;
2690 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To " 2690 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
2691 "use the camera, close and open /dev/video%d again.", 2691 "use the camera, close and open /dev/video%d again.",
2692 cam->v4ldev->minor); 2692 cam->v4ldev->num);
2693 return -EIO; 2693 return -EIO;
2694 } 2694 }
2695 2695
@@ -2701,7 +2701,7 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd,
2701 cam->state |= DEV_MISCONFIGURED; 2701 cam->state |= DEV_MISCONFIGURED;
2702 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To " 2702 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
2703 "use the camera, close and open /dev/video%d again.", 2703 "use the camera, close and open /dev/video%d again.",
2704 cam->v4ldev->minor); 2704 cam->v4ldev->num);
2705 return -ENOMEM; 2705 return -ENOMEM;
2706 } 2706 }
2707 2707
@@ -2748,7 +2748,7 @@ sn9c102_vidioc_s_jpegcomp(struct sn9c102_device* cam, void __user * arg)
2748 cam->state |= DEV_MISCONFIGURED; 2748 cam->state |= DEV_MISCONFIGURED;
2749 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware " 2749 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
2750 "problems. To use the camera, close and open " 2750 "problems. To use the camera, close and open "
2751 "/dev/video%d again.", cam->v4ldev->minor); 2751 "/dev/video%d again.", cam->v4ldev->num);
2752 return -EIO; 2752 return -EIO;
2753 } 2753 }
2754 2754
@@ -3348,7 +3348,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
3348 goto fail; 3348 goto fail;
3349 } 3349 }
3350 3350
3351 DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor); 3351 DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->num);
3352 3352
3353 video_set_drvdata(cam->v4ldev, cam); 3353 video_set_drvdata(cam->v4ldev, cam);
3354 cam->module_param.force_munmap = force_munmap[dev_nr]; 3354 cam->module_param.force_munmap = force_munmap[dev_nr];
@@ -3402,7 +3402,7 @@ static void sn9c102_usb_disconnect(struct usb_interface* intf)
3402 if (cam->users) { 3402 if (cam->users) {
3403 DBG(2, "Device /dev/video%d is open! Deregistration and " 3403 DBG(2, "Device /dev/video%d is open! Deregistration and "
3404 "memory deallocation are deferred.", 3404 "memory deallocation are deferred.",
3405 cam->v4ldev->minor); 3405 cam->v4ldev->num);
3406 cam->state |= DEV_MISCONFIGURED; 3406 cam->state |= DEV_MISCONFIGURED;
3407 sn9c102_stop_transfer(cam); 3407 sn9c102_stop_transfer(cam);
3408 cam->state |= DEV_DISCONNECTED; 3408 cam->state |= DEV_DISCONNECTED;
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index edaea4964513..e9eb6d754d5c 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -1331,7 +1331,7 @@ static int stk_register_video_device(struct stk_camera *dev)
1331 STK_ERROR("v4l registration failed\n"); 1331 STK_ERROR("v4l registration failed\n");
1332 else 1332 else
1333 STK_INFO("Syntek USB2.0 Camera is now controlling video device" 1333 STK_INFO("Syntek USB2.0 Camera is now controlling video device"
1334 " /dev/video%d\n", dev->vdev.minor); 1334 " /dev/video%d\n", dev->vdev.num);
1335 return err; 1335 return err;
1336} 1336}
1337 1337
@@ -1426,7 +1426,7 @@ static void stk_camera_disconnect(struct usb_interface *interface)
1426 stk_remove_sysfs_files(&dev->vdev); 1426 stk_remove_sysfs_files(&dev->vdev);
1427 1427
1428 STK_INFO("Syntek USB2.0 Camera release resources " 1428 STK_INFO("Syntek USB2.0 Camera release resources "
1429 "video device /dev/video%d\n", dev->vdev.minor); 1429 "video device /dev/video%d\n", dev->vdev.num);
1430 1430
1431 video_unregister_device(&dev->vdev); 1431 video_unregister_device(&dev->vdev);
1432} 1432}
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index 9c549d935994..328c41b1517d 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1470,7 +1470,8 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id
1470 retval = -EIO; 1470 retval = -EIO;
1471 goto error_vdev; 1471 goto error_vdev;
1472 } 1472 }
1473 PDEBUG (0, "STV(i): registered new video device: video%d", stv680->vdev->minor); 1473 PDEBUG(0, "STV(i): registered new video device: video%d",
1474 stv680->vdev->num);
1474 1475
1475 usb_set_intfdata (intf, stv680); 1476 usb_set_intfdata (intf, stv680);
1476 retval = stv680_create_sysfs_files(stv680->vdev); 1477 retval = stv680_create_sysfs_files(stv680->vdev);
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 07cd87d16f69..7c575bb8184f 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1059,7 +1059,7 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
1059 1059
1060 dev_info(&uvd->dev->dev, "%s on /dev/video%d: canvas=%s videosize=%s\n", 1060 dev_info(&uvd->dev->dev, "%s on /dev/video%d: canvas=%s videosize=%s\n",
1061 (uvd->handle != NULL) ? uvd->handle->drvName : "???", 1061 (uvd->handle != NULL) ? uvd->handle->drvName : "???",
1062 uvd->vdev.minor, tmp2, tmp1); 1062 uvd->vdev.num, tmp2, tmp1);
1063 1063
1064 usb_get_dev(uvd->dev); 1064 usb_get_dev(uvd->dev);
1065 return 0; 1065 return 0;
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 7a127d6bfdee..8e2d58bec481 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -877,7 +877,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
877 return -EIO; 877 return -EIO;
878 } 878 }
879 879
880 printk(KERN_INFO "ViCam webcam driver now controlling video device %d\n",cam->vdev.minor); 880 printk(KERN_INFO "ViCam webcam driver now controlling video device %d\n",
881 cam->vdev.num);
881 882
882 usb_set_intfdata (intf, cam); 883 usb_set_intfdata (intf, cam);
883 884
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index 92427fdc1459..9907b9aff2b9 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -236,7 +236,7 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
236 sizeof(struct i2c_client)); 236 sizeof(struct i2c_client));
237 237
238 sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name), 238 sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name),
239 " #%d", usbvision->vdev->minor & 0x1f); 239 " #%d", usbvision->vdev->num);
240 PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name); 240 PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name);
241 usbvision->i2c_adap.dev.parent = &usbvision->dev->dev; 241 usbvision->i2c_adap.dev.parent = &usbvision->dev->dev;
242 242
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 77aeb39b2750..d185b57fdcd0 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1440,7 +1440,7 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
1440 // vbi Device: 1440 // vbi Device:
1441 if (usbvision->vbi) { 1441 if (usbvision->vbi) {
1442 PDEBUG(DBG_PROBE, "unregister /dev/vbi%d [v4l2]", 1442 PDEBUG(DBG_PROBE, "unregister /dev/vbi%d [v4l2]",
1443 usbvision->vbi->minor & 0x1f); 1443 usbvision->vbi->num);
1444 if (usbvision->vbi->minor != -1) { 1444 if (usbvision->vbi->minor != -1) {
1445 video_unregister_device(usbvision->vbi); 1445 video_unregister_device(usbvision->vbi);
1446 } else { 1446 } else {
@@ -1452,7 +1452,7 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
1452 // Radio Device: 1452 // Radio Device:
1453 if (usbvision->rdev) { 1453 if (usbvision->rdev) {
1454 PDEBUG(DBG_PROBE, "unregister /dev/radio%d [v4l2]", 1454 PDEBUG(DBG_PROBE, "unregister /dev/radio%d [v4l2]",
1455 usbvision->rdev->minor & 0x1f); 1455 usbvision->rdev->num);
1456 if (usbvision->rdev->minor != -1) { 1456 if (usbvision->rdev->minor != -1) {
1457 video_unregister_device(usbvision->rdev); 1457 video_unregister_device(usbvision->rdev);
1458 } else { 1458 } else {
@@ -1464,7 +1464,7 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
1464 // Video Device: 1464 // Video Device:
1465 if (usbvision->vdev) { 1465 if (usbvision->vdev) {
1466 PDEBUG(DBG_PROBE, "unregister /dev/video%d [v4l2]", 1466 PDEBUG(DBG_PROBE, "unregister /dev/video%d [v4l2]",
1467 usbvision->vdev->minor & 0x1f); 1467 usbvision->vdev->num);
1468 if (usbvision->vdev->minor != -1) { 1468 if (usbvision->vdev->minor != -1) {
1469 video_unregister_device(usbvision->vdev); 1469 video_unregister_device(usbvision->vdev);
1470 } else { 1470 } else {
@@ -1490,7 +1490,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
1490 goto err_exit; 1490 goto err_exit;
1491 } 1491 }
1492 printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n", 1492 printk(KERN_INFO "USBVision[%d]: registered USBVision Video device /dev/video%d [v4l2]\n",
1493 usbvision->nr,usbvision->vdev->minor & 0x1f); 1493 usbvision->nr, usbvision->vdev->num);
1494 1494
1495 // Radio Device: 1495 // Radio Device:
1496 if (usbvision_device_data[usbvision->DevModel].Radio) { 1496 if (usbvision_device_data[usbvision->DevModel].Radio) {
@@ -1507,7 +1507,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
1507 goto err_exit; 1507 goto err_exit;
1508 } 1508 }
1509 printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n", 1509 printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device /dev/radio%d [v4l2]\n",
1510 usbvision->nr, usbvision->rdev->minor & 0x1f); 1510 usbvision->nr, usbvision->rdev->num);
1511 } 1511 }
1512 // vbi Device: 1512 // vbi Device:
1513 if (usbvision_device_data[usbvision->DevModel].vbi) { 1513 if (usbvision_device_data[usbvision->DevModel].vbi) {
@@ -1523,7 +1523,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
1523 goto err_exit; 1523 goto err_exit;
1524 } 1524 }
1525 printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n", 1525 printk(KERN_INFO "USBVision[%d]: registered USBVision VBI device /dev/vbi%d [v4l2] (Not Working Yet!)\n",
1526 usbvision->nr,usbvision->vbi->minor & 0x1f); 1526 usbvision->nr, usbvision->vbi->num);
1527 } 1527 }
1528 // all done 1528 // all done
1529 return 0; 1529 return 0;
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 7d7e51def461..e15e48f04be7 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -1163,11 +1163,11 @@ static int vivi_release(void)
1163 1163
1164 if (-1 != dev->vfd->minor) { 1164 if (-1 != dev->vfd->minor) {
1165 printk(KERN_INFO "%s: unregistering /dev/video%d\n", 1165 printk(KERN_INFO "%s: unregistering /dev/video%d\n",
1166 VIVI_MODULE_NAME, dev->vfd->minor); 1166 VIVI_MODULE_NAME, dev->vfd->num);
1167 video_unregister_device(dev->vfd); 1167 video_unregister_device(dev->vfd);
1168 } else { 1168 } else {
1169 printk(KERN_INFO "%s: releasing /dev/video%d\n", 1169 printk(KERN_INFO "%s: releasing /dev/video%d\n",
1170 VIVI_MODULE_NAME, dev->vfd->minor); 1170 VIVI_MODULE_NAME, dev->vfd->num);
1171 video_device_release(dev->vfd); 1171 video_device_release(dev->vfd);
1172 } 1172 }
1173 1173
@@ -1307,7 +1307,7 @@ static int __init vivi_init(void)
1307 1307
1308 dev->vfd = vfd; 1308 dev->vfd = vfd;
1309 printk(KERN_INFO "%s: V4L2 device registered as /dev/video%d\n", 1309 printk(KERN_INFO "%s: V4L2 device registered as /dev/video%d\n",
1310 VIVI_MODULE_NAME, vfd->minor); 1310 VIVI_MODULE_NAME, vfd->num);
1311 } 1311 }
1312 1312
1313 if (ret < 0) { 1313 if (ret < 0) {
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index dcd45dbd82dc..4dfb43bd1846 100644
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -2398,7 +2398,7 @@ error:
2398 cam->sensor = CC_UNKNOWN; 2398 cam->sensor = CC_UNKNOWN;
2399 DBG(1, "Image sensor initialization failed for %s (/dev/video%d). " 2399 DBG(1, "Image sensor initialization failed for %s (/dev/video%d). "
2400 "Try to detach and attach this device again", 2400 "Try to detach and attach this device again",
2401 symbolic(camlist, cam->id), cam->v4ldev->minor) 2401 symbolic(camlist, cam->id), cam->v4ldev->num)
2402 return err; 2402 return err;
2403} 2403}
2404 2404
@@ -2644,7 +2644,7 @@ static void w9968cf_release_resources(struct w9968cf_device* cam)
2644{ 2644{
2645 mutex_lock(&w9968cf_devlist_mutex); 2645 mutex_lock(&w9968cf_devlist_mutex);
2646 2646
2647 DBG(2, "V4L device deregistered: /dev/video%d", cam->v4ldev->minor) 2647 DBG(2, "V4L device deregistered: /dev/video%d", cam->v4ldev->num)
2648 2648
2649 video_unregister_device(cam->v4ldev); 2649 video_unregister_device(cam->v4ldev);
2650 list_del(&cam->v4llist); 2650 list_del(&cam->v4llist);
@@ -2679,7 +2679,7 @@ static int w9968cf_open(struct inode* inode, struct file* filp)
2679 DBG(2, "No supported image sensor has been detected by the " 2679 DBG(2, "No supported image sensor has been detected by the "
2680 "'ovcamchip' module for the %s (/dev/video%d). Make " 2680 "'ovcamchip' module for the %s (/dev/video%d). Make "
2681 "sure it is loaded *before* (re)connecting the camera.", 2681 "sure it is loaded *before* (re)connecting the camera.",
2682 symbolic(camlist, cam->id), cam->v4ldev->minor) 2682 symbolic(camlist, cam->id), cam->v4ldev->num)
2683 mutex_unlock(&cam->dev_mutex); 2683 mutex_unlock(&cam->dev_mutex);
2684 up_read(&w9968cf_disconnect); 2684 up_read(&w9968cf_disconnect);
2685 return -ENODEV; 2685 return -ENODEV;
@@ -2687,7 +2687,7 @@ static int w9968cf_open(struct inode* inode, struct file* filp)
2687 2687
2688 if (cam->users) { 2688 if (cam->users) {
2689 DBG(2, "%s (/dev/video%d) has been already occupied by '%s'", 2689 DBG(2, "%s (/dev/video%d) has been already occupied by '%s'",
2690 symbolic(camlist, cam->id),cam->v4ldev->minor,cam->command) 2690 symbolic(camlist, cam->id), cam->v4ldev->num, cam->command)
2691 if ((filp->f_flags & O_NONBLOCK)||(filp->f_flags & O_NDELAY)) { 2691 if ((filp->f_flags & O_NONBLOCK)||(filp->f_flags & O_NDELAY)) {
2692 mutex_unlock(&cam->dev_mutex); 2692 mutex_unlock(&cam->dev_mutex);
2693 up_read(&w9968cf_disconnect); 2693 up_read(&w9968cf_disconnect);
@@ -2709,7 +2709,7 @@ static int w9968cf_open(struct inode* inode, struct file* filp)
2709 } 2709 }
2710 2710
2711 DBG(5, "Opening '%s', /dev/video%d ...", 2711 DBG(5, "Opening '%s', /dev/video%d ...",
2712 symbolic(camlist, cam->id), cam->v4ldev->minor) 2712 symbolic(camlist, cam->id), cam->v4ldev->num)
2713 2713
2714 cam->streaming = 0; 2714 cam->streaming = 0;
2715 cam->misconfigured = 0; 2715 cam->misconfigured = 0;
@@ -2947,7 +2947,7 @@ static int w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
2947 .minheight = cam->minheight, 2947 .minheight = cam->minheight,
2948 }; 2948 };
2949 sprintf(cap.name, "W996[87]CF USB Camera #%d", 2949 sprintf(cap.name, "W996[87]CF USB Camera #%d",
2950 cam->v4ldev->minor); 2950 cam->v4ldev->num);
2951 cap.maxwidth = (cam->upscaling && w9968cf_vpp) 2951 cap.maxwidth = (cam->upscaling && w9968cf_vpp)
2952 ? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth) 2952 ? max((u16)W9968CF_MAX_WIDTH, cam->maxwidth)
2953 : cam->maxwidth; 2953 : cam->maxwidth;
@@ -3567,7 +3567,7 @@ w9968cf_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
3567 goto fail; 3567 goto fail;
3568 } 3568 }
3569 3569
3570 DBG(2, "V4L device registered as /dev/video%d", cam->v4ldev->minor) 3570 DBG(2, "V4L device registered as /dev/video%d", cam->v4ldev->num)
3571 3571
3572 /* Set some basic constants */ 3572 /* Set some basic constants */
3573 w9968cf_configure_camera(cam, udev, mod_id, dev_nr); 3573 w9968cf_configure_camera(cam, udev, mod_id, dev_nr);
@@ -3618,7 +3618,7 @@ static void w9968cf_usb_disconnect(struct usb_interface* intf)
3618 DBG(2, "The device is open (/dev/video%d)! " 3618 DBG(2, "The device is open (/dev/video%d)! "
3619 "Process name: %s. Deregistration and memory " 3619 "Process name: %s. Deregistration and memory "
3620 "deallocation are deferred on close.", 3620 "deallocation are deferred on close.",
3621 cam->v4ldev->minor, cam->command) 3621 cam->v4ldev->num, cam->command)
3622 cam->misconfigured = 1; 3622 cam->misconfigured = 1;
3623 w9968cf_stop_transfer(cam); 3623 w9968cf_stop_transfer(cam);
3624 wake_up_interruptible(&cam->wait_queue); 3624 wake_up_interruptible(&cam->wait_queue);
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 6a0902bcba6b..9fc581707638 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -539,7 +539,7 @@ static int zc0301_stream_interrupt(struct zc0301_device* cam)
539 cam->state |= DEV_MISCONFIGURED; 539 cam->state |= DEV_MISCONFIGURED;
540 DBG(1, "URB timeout reached. The camera is misconfigured. To " 540 DBG(1, "URB timeout reached. The camera is misconfigured. To "
541 "use it, close and open /dev/video%d again.", 541 "use it, close and open /dev/video%d again.",
542 cam->v4ldev->minor); 542 cam->v4ldev->num);
543 return -EIO; 543 return -EIO;
544 } 544 }
545 545
@@ -640,7 +640,7 @@ static void zc0301_release_resources(struct kref *kref)
640{ 640{
641 struct zc0301_device *cam = container_of(kref, struct zc0301_device, 641 struct zc0301_device *cam = container_of(kref, struct zc0301_device,
642 kref); 642 kref);
643 DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor); 643 DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->num);
644 video_set_drvdata(cam->v4ldev, NULL); 644 video_set_drvdata(cam->v4ldev, NULL);
645 video_unregister_device(cam->v4ldev); 645 video_unregister_device(cam->v4ldev);
646 usb_put_dev(cam->usbdev); 646 usb_put_dev(cam->usbdev);
@@ -679,7 +679,7 @@ static int zc0301_open(struct inode* inode, struct file* filp)
679 } 679 }
680 680
681 if (cam->users) { 681 if (cam->users) {
682 DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->minor); 682 DBG(2, "Device /dev/video%d is busy...", cam->v4ldev->num);
683 DBG(3, "Simultaneous opens are not supported"); 683 DBG(3, "Simultaneous opens are not supported");
684 if ((filp->f_flags & O_NONBLOCK) || 684 if ((filp->f_flags & O_NONBLOCK) ||
685 (filp->f_flags & O_NDELAY)) { 685 (filp->f_flags & O_NDELAY)) {
@@ -722,7 +722,7 @@ static int zc0301_open(struct inode* inode, struct file* filp)
722 cam->frame_count = 0; 722 cam->frame_count = 0;
723 zc0301_empty_framequeues(cam); 723 zc0301_empty_framequeues(cam);
724 724
725 DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor); 725 DBG(3, "Video device /dev/video%d is open", cam->v4ldev->num);
726 726
727out: 727out:
728 mutex_unlock(&cam->open_mutex); 728 mutex_unlock(&cam->open_mutex);
@@ -746,7 +746,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)
746 cam->users--; 746 cam->users--;
747 wake_up_interruptible_nr(&cam->wait_open, 1); 747 wake_up_interruptible_nr(&cam->wait_open, 1);
748 748
749 DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor); 749 DBG(3, "Video device /dev/video%d closed", cam->v4ldev->num);
750 750
751 kref_put(&cam->kref, zc0301_release_resources); 751 kref_put(&cam->kref, zc0301_release_resources);
752 752
@@ -1275,7 +1275,7 @@ zc0301_vidioc_s_crop(struct zc0301_device* cam, void __user * arg)
1275 cam->state |= DEV_MISCONFIGURED; 1275 cam->state |= DEV_MISCONFIGURED;
1276 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To " 1276 DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To "
1277 "use the camera, close and open /dev/video%d again.", 1277 "use the camera, close and open /dev/video%d again.",
1278 cam->v4ldev->minor); 1278 cam->v4ldev->num);
1279 return -EIO; 1279 return -EIO;
1280 } 1280 }
1281 1281
@@ -1288,7 +1288,7 @@ zc0301_vidioc_s_crop(struct zc0301_device* cam, void __user * arg)
1288 cam->state |= DEV_MISCONFIGURED; 1288 cam->state |= DEV_MISCONFIGURED;
1289 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To " 1289 DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To "
1290 "use the camera, close and open /dev/video%d again.", 1290 "use the camera, close and open /dev/video%d again.",
1291 cam->v4ldev->minor); 1291 cam->v4ldev->num);
1292 return -ENOMEM; 1292 return -ENOMEM;
1293 } 1293 }
1294 1294
@@ -1470,7 +1470,7 @@ zc0301_vidioc_try_s_fmt(struct zc0301_device* cam, unsigned int cmd,
1470 cam->state |= DEV_MISCONFIGURED; 1470 cam->state |= DEV_MISCONFIGURED;
1471 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To " 1471 DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To "
1472 "use the camera, close and open /dev/video%d again.", 1472 "use the camera, close and open /dev/video%d again.",
1473 cam->v4ldev->minor); 1473 cam->v4ldev->num);
1474 return -EIO; 1474 return -EIO;
1475 } 1475 }
1476 1476
@@ -1482,7 +1482,7 @@ zc0301_vidioc_try_s_fmt(struct zc0301_device* cam, unsigned int cmd,
1482 cam->state |= DEV_MISCONFIGURED; 1482 cam->state |= DEV_MISCONFIGURED;
1483 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To " 1483 DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To "
1484 "use the camera, close and open /dev/video%d again.", 1484 "use the camera, close and open /dev/video%d again.",
1485 cam->v4ldev->minor); 1485 cam->v4ldev->num);
1486 return -ENOMEM; 1486 return -ENOMEM;
1487 } 1487 }
1488 1488
@@ -1529,7 +1529,7 @@ zc0301_vidioc_s_jpegcomp(struct zc0301_device* cam, void __user * arg)
1529 cam->state |= DEV_MISCONFIGURED; 1529 cam->state |= DEV_MISCONFIGURED;
1530 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware " 1530 DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware "
1531 "problems. To use the camera, close and open " 1531 "problems. To use the camera, close and open "
1532 "/dev/video%d again.", cam->v4ldev->minor); 1532 "/dev/video%d again.", cam->v4ldev->num);
1533 return -EIO; 1533 return -EIO;
1534 } 1534 }
1535 1535
@@ -2005,7 +2005,7 @@ zc0301_usb_probe(struct usb_interface* intf, const struct usb_device_id* id)
2005 goto fail; 2005 goto fail;
2006 } 2006 }
2007 2007
2008 DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor); 2008 DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->num);
2009 2009
2010 cam->module_param.force_munmap = force_munmap[dev_nr]; 2010 cam->module_param.force_munmap = force_munmap[dev_nr];
2011 cam->module_param.frame_timeout = frame_timeout[dev_nr]; 2011 cam->module_param.frame_timeout = frame_timeout[dev_nr];
@@ -2044,7 +2044,7 @@ static void zc0301_usb_disconnect(struct usb_interface* intf)
2044 if (cam->users) { 2044 if (cam->users) {
2045 DBG(2, "Device /dev/video%d is open! Deregistration and " 2045 DBG(2, "Device /dev/video%d is open! Deregistration and "
2046 "memory deallocation are deferred.", 2046 "memory deallocation are deferred.",
2047 cam->v4ldev->minor); 2047 cam->v4ldev->num);
2048 cam->state |= DEV_MISCONFIGURED; 2048 cam->state |= DEV_MISCONFIGURED;
2049 zc0301_stop_transfer(cam); 2049 zc0301_stop_transfer(cam);
2050 cam->state |= DEV_DISCONNECTED; 2050 cam->state |= DEV_DISCONNECTED;
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 7cdac99deea6..a1d81ed44c7c 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -885,7 +885,7 @@ static int zr364xx_probe(struct usb_interface *intf,
885 usb_set_intfdata(intf, cam); 885 usb_set_intfdata(intf, cam);
886 886
887 dev_info(&udev->dev, DRIVER_DESC " controlling video device %d\n", 887 dev_info(&udev->dev, DRIVER_DESC " controlling video device %d\n",
888 cam->vdev->minor); 888 cam->vdev->num);
889 return 0; 889 return 0;
890} 890}
891 891