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-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 6d865a7a91ec..810c366b73b0 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -148,7 +148,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 {
         int mult;
         struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_get_drvdata(dev);
 
         if (v->index > 0)
                 return -EINVAL;
@@ -177,7 +177,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
         struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_get_drvdata(dev);
 
         if (!(fmi->flags & V4L2_TUNER_CAP_LOW))
                 f->frequency *= 1000;
@@ -195,7 +195,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
         struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_get_drvdata(dev);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = fmi->curfreq;
@@ -223,7 +223,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
         struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_get_drvdata(dev);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -237,7 +237,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
         struct video_device *dev = video_devdata(file);
-        struct fmi_device *fmi = dev->priv;
+        struct fmi_device *fmi = video_get_drvdata(dev);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -386,7 +386,7 @@ static int __init fmi_init(void)
         fmi_unit.curvol = 0;
         fmi_unit.curfreq = 0;
         fmi_unit.flags = V4L2_TUNER_CAP_LOW;
-        fmi_radio.priv = &fmi_unit;
+        video_set_drvdata(&fmi_radio, &fmi_unit);
 
         mutex_init(&lock);