V4L/DVB (8788): v4l: replace video_get_drvdata(video_devdata(filp)) with video_drvdata(filp)

Use the new video_drvdata(filp) function where it is safe to do so.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 27255d7ff1ba..952ec35a8415 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -223,8 +223,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct typhoon_device *typhoon = video_get_drvdata(dev);
+        struct typhoon_device *typhoon = video_drvdata(file);
 
         typhoon->curfreq = f->frequency;
         typhoon_setfreq(typhoon, typhoon->curfreq);
@@ -234,8 +233,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 static int vidioc_g_frequency(struct file *file, void *priv,
                                         struct v4l2_frequency *f)
 {
-        struct video_device *dev = video_devdata(file);
-        struct typhoon_device *typhoon = video_get_drvdata(dev);
+        struct typhoon_device *typhoon = video_drvdata(file);
 
         f->type = V4L2_TUNER_RADIO;
         f->frequency = typhoon->curfreq;
@@ -261,8 +259,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct typhoon_device *typhoon = video_get_drvdata(dev);
+        struct typhoon_device *typhoon = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
@@ -278,8 +275,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl (struct file *file, void *priv,
                                         struct v4l2_control *ctrl)
 {
-        struct video_device *dev = video_devdata(file);
-        struct typhoon_device *typhoon = video_get_drvdata(dev);
+        struct typhoon_device *typhoon = video_drvdata(file);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE: