diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-23 07:32:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:54 -0400 |
commit | c170ecf434bceb0e188b14a6deb3bfa3ec9ef699 (patch) | |
tree | fa62c2e14adeff72310c9a6b8cba675f3153feed /drivers/media/radio/radio-gemtek.c | |
parent | bfa8a273bb91078ea193ab94c717889928f3b925 (diff) |
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>
Diffstat (limited to 'drivers/media/radio/radio-gemtek.c')
-rw-r--r-- | drivers/media/radio/radio-gemtek.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c index 2c4c15e6d510..d131a5d38128 100644 --- a/drivers/media/radio/radio-gemtek.c +++ b/drivers/media/radio/radio-gemtek.c | |||
@@ -459,8 +459,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *v) | |||
459 | static int vidioc_s_frequency(struct file *file, void *priv, | 459 | static int vidioc_s_frequency(struct file *file, void *priv, |
460 | struct v4l2_frequency *f) | 460 | struct v4l2_frequency *f) |
461 | { | 461 | { |
462 | struct video_device *dev = video_devdata(file); | 462 | struct gemtek_device *rt = video_drvdata(file); |
463 | struct gemtek_device *rt = video_get_drvdata(dev); | ||
464 | 463 | ||
465 | gemtek_setfreq(rt, f->frequency); | 464 | gemtek_setfreq(rt, f->frequency); |
466 | 465 | ||
@@ -470,8 +469,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, | |||
470 | static int vidioc_g_frequency(struct file *file, void *priv, | 469 | static int vidioc_g_frequency(struct file *file, void *priv, |
471 | struct v4l2_frequency *f) | 470 | struct v4l2_frequency *f) |
472 | { | 471 | { |
473 | struct video_device *dev = video_devdata(file); | 472 | struct gemtek_device *rt = video_drvdata(file); |
474 | struct gemtek_device *rt = video_get_drvdata(dev); | ||
475 | 473 | ||
476 | f->type = V4L2_TUNER_RADIO; | 474 | f->type = V4L2_TUNER_RADIO; |
477 | f->frequency = rt->lastfreq; | 475 | f->frequency = rt->lastfreq; |
@@ -495,8 +493,7 @@ static int vidioc_queryctrl(struct file *file, void *priv, | |||
495 | static int vidioc_g_ctrl(struct file *file, void *priv, | 493 | static int vidioc_g_ctrl(struct file *file, void *priv, |
496 | struct v4l2_control *ctrl) | 494 | struct v4l2_control *ctrl) |
497 | { | 495 | { |
498 | struct video_device *dev = video_devdata(file); | 496 | struct gemtek_device *rt = video_drvdata(file); |
499 | struct gemtek_device *rt = video_get_drvdata(dev); | ||
500 | 497 | ||
501 | switch (ctrl->id) { | 498 | switch (ctrl->id) { |
502 | case V4L2_CID_AUDIO_MUTE: | 499 | case V4L2_CID_AUDIO_MUTE: |
@@ -515,8 +512,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv, | |||
515 | static int vidioc_s_ctrl(struct file *file, void *priv, | 512 | static int vidioc_s_ctrl(struct file *file, void *priv, |
516 | struct v4l2_control *ctrl) | 513 | struct v4l2_control *ctrl) |
517 | { | 514 | { |
518 | struct video_device *dev = video_devdata(file); | 515 | struct gemtek_device *rt = video_drvdata(file); |
519 | struct gemtek_device *rt = video_get_drvdata(dev); | ||
520 | 516 | ||
521 | switch (ctrl->id) { | 517 | switch (ctrl->id) { |
522 | case V4L2_CID_AUDIO_MUTE: | 518 | case V4L2_CID_AUDIO_MUTE: |