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

diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index c0600fdbfc6f..b14c59c281eb 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3155,7 +3155,7 @@ static void put_cam(struct cpia_camera_ops* ops)
 static int cpia_open(struct inode *inode, struct file *file)
 {
         struct video_device *dev = video_devdata(file);
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int err;
 
         if (!cam) {
@@ -3232,7 +3232,7 @@ static int cpia_open(struct inode *inode, struct file *file)
 static int cpia_close(struct inode *inode, struct file *file)
 {
         struct  video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
 
         if (cam->ops) {
                 /* Return ownership of /proc/cpia/videoX to root */
@@ -3284,7 +3284,7 @@ static ssize_t cpia_read(struct file *file, char __user *buf,
                          size_t count, loff_t *ppos)
 {
         struct video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int err;
 
         /* make this _really_ smp and multithread-safe */
@@ -3341,7 +3341,7 @@ static int cpia_do_ioctl(struct inode *inode, struct file *file,
                          unsigned int ioctlnr, void *arg)
 {
         struct video_device *dev = file->private_data;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int retval = 0;
 
         if (!cam || !cam->ops)
@@ -3739,7 +3739,7 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)
         unsigned long start = vma->vm_start;
         unsigned long size  = vma->vm_end - vma->vm_start;
         unsigned long page, pos;
-        struct cam_data *cam = dev->priv;
+        struct cam_data *cam = video_get_drvdata(dev);
         int retval;
 
         if (!cam || !cam->ops)
@@ -3929,7 +3929,7 @@ static void init_camera_struct(struct cam_data *cam,
         cam->proc_entry = NULL;
 
         memcpy(&cam->vdev, &cpia_template, sizeof(cpia_template));
-        cam->vdev.priv = cam;
+        video_set_drvdata(&cam->vdev, cam);
 
         cam->curframe = 0;
         for (i = 0; i < FRAME_NUM; i++) {