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-terratec.c b/drivers/media/radio/radio-terratec.c
index de13ec81ce49..0bc9af686ad7 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -222,7 +222,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
         struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_get_drvdata(dev);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -250,7 +250,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
         struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_get_drvdata(dev);
 
         tt->curfreq = f->frequency;
         tt_setfreq(tt, tt->curfreq);
@@ -261,7 +261,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
         struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_get_drvdata(dev);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = tt->curfreq;
@@ -287,7 +287,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
         struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_get_drvdata(dev);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -307,7 +307,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
         struct video_device *dev = video_devdata(file);
-        struct tt_device *tt = dev->priv;
+        struct tt_device *tt = video_get_drvdata(dev);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -414,7 +414,7 @@ static int __init terratec_init(void)
                 return -EBUSY;
         }
 
-        terratec_radio.priv=&terratec_unit;
+        video_set_drvdata(&terratec_radio, &terratec_unit);
 
         spin_lock_init(&lock);