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/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 59fdaf85e41b..62cc6874d63f 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -247,7 +247,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
         struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_get_drvdata(dev);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -275,7 +275,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
         struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_get_drvdata(dev);
 
         rt->curfreq = f->frequency;
         rt_setfreq(rt, rt->curfreq);
@@ -286,7 +286,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
         struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_get_drvdata(dev);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = rt->curfreq;
@@ -312,7 +312,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
         struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_get_drvdata(dev);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -329,7 +329,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
         struct video_device *dev = video_devdata(file);
-        struct rt_device *rt = dev->priv;
+        struct rt_device *rt = video_get_drvdata(dev);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -437,7 +437,7 @@ static int __init rtrack_init(void)
                 return -EBUSY;
         }
 
-        rtrack_radio.priv=&rtrack_unit;
+        video_set_drvdata(&rtrack_radio, &rtrack_unit);
 
         if (video_register_device(&rtrack_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);