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>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 1798b779a25..16c094f7785 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)
         if (!cpia_proc_root || !cam)
                 return;
 
-        snprintf(name, sizeof(name), "video%d", cam->vdev.minor);
+        snprintf(name, sizeof(name), "video%d", cam->vdev.num);
 
         ent = create_proc_entry(name, S_IFREG|S_IRUGO|S_IWUSR, cpia_proc_root);
         if (!ent)
@@ -1372,7 +1372,7 @@ static void destroy_proc_cpia_cam(struct cam_data *cam)
         if (!cam || !cam->proc_entry)
                 return;
 
-        snprintf(name, sizeof(name), "video%d", cam->vdev.minor);
+        snprintf(name, sizeof(name), "video%d", cam->vdev.num);
         remove_proc_entry(name, cpia_proc_root);
         cam->proc_entry = NULL;
 }
@@ -4005,7 +4005,7 @@ void cpia_unregister_camera(struct cam_data *cam)
         }
 
 #ifdef CONFIG_PROC_FS
-        DBG("destroying /proc/cpia/video%d\n", cam->vdev.minor);
+        DBG("destroying /proc/cpia/video%d\n", cam->vdev.num);
         destroy_proc_cpia_cam(cam);
 #endif
         if (!cam->open_count) {