V4L/DVB (8786): v4l2: remove the priv field, use dev_get_drvdata instead

Remove the priv field and let video_get/set_drvdata use dev_get_drvdata
and dev_set_drvdata instead.

Convert all drivers that still used priv directly.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index d7728256f295..1ffcc393fcbb 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -473,8 +473,8 @@ static int
 vicam_open(struct inode *inode, struct file *file)
 {
         struct video_device *dev = video_devdata(file);
-        struct vicam_camera *cam =
-            (struct vicam_camera *) dev->priv;
+        struct vicam_camera *cam = video_get_drvdata(dev);
+
         DBG("open\n");
 
         if (!cam) {
@@ -866,9 +866,8 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
 
         mutex_init(&cam->cam_lock);
 
-        memcpy(&cam->vdev, &vicam_template,
-               sizeof (vicam_template));
-        cam->vdev.priv = cam;   // sort of a reverse mapping for those functions that get vdev only
+        memcpy(&cam->vdev, &vicam_template, sizeof(vicam_template));
+        video_set_drvdata(&cam->vdev, cam);
 
         cam->udev = dev;
         cam->bulkEndpoint = bulkEndpoint;