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, 2 insertions, 2 deletions

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)
 
         if (!cafe_dfs_root)
                 return;
-        sprintf(fname, "regs-%d", cam->v4ldev.minor);
+        sprintf(fname, "regs-%d", cam->v4ldev.num);
         cam->dfs_regs = debugfs_create_file(fname, 0444, cafe_dfs_root,
                         cam, &cafe_dfs_reg_ops);
-        sprintf(fname, "cam-%d", cam->v4ldev.minor);
+        sprintf(fname, "cam-%d", cam->v4ldev.num);
         cam->dfs_cam_regs = debugfs_create_file(fname, 0444, cafe_dfs_root,
                         cam, &cafe_dfs_cam_ops);
 }