diff options
Diffstat (limited to 'drivers/media/radio/radio-aztech.c')
-rw-r--r-- | drivers/media/radio/radio-aztech.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index 5dd5e349ef47..d78489573230 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c | |||
@@ -196,8 +196,7 @@ static int vidioc_querycap (struct file *file, void *priv, | |||
196 | static int vidioc_g_tuner (struct file *file, void *priv, | 196 | static int vidioc_g_tuner (struct file *file, void *priv, |
197 | struct v4l2_tuner *v) | 197 | struct v4l2_tuner *v) |
198 | { | 198 | { |
199 | struct video_device *dev = video_devdata(file); | 199 | struct az_device *az = video_drvdata(file); |
200 | struct az_device *az = video_get_drvdata(dev); | ||
201 | 200 | ||
202 | if (v->index > 0) | 201 | if (v->index > 0) |
203 | return -EINVAL; | 202 | return -EINVAL; |
@@ -265,8 +264,7 @@ static int vidioc_s_audio (struct file *file, void *priv, | |||
265 | static int vidioc_s_frequency (struct file *file, void *priv, | 264 | static int vidioc_s_frequency (struct file *file, void *priv, |
266 | struct v4l2_frequency *f) | 265 | struct v4l2_frequency *f) |
267 | { | 266 | { |
268 | struct video_device *dev = video_devdata(file); | 267 | struct az_device *az = video_drvdata(file); |
269 | struct az_device *az = video_get_drvdata(dev); | ||
270 | 268 | ||
271 | az->curfreq = f->frequency; | 269 | az->curfreq = f->frequency; |
272 | az_setfreq(az, az->curfreq); | 270 | az_setfreq(az, az->curfreq); |
@@ -276,8 +274,7 @@ static int vidioc_s_frequency (struct file *file, void *priv, | |||
276 | static int vidioc_g_frequency (struct file *file, void *priv, | 274 | static int vidioc_g_frequency (struct file *file, void *priv, |
277 | struct v4l2_frequency *f) | 275 | struct v4l2_frequency *f) |
278 | { | 276 | { |
279 | struct video_device *dev = video_devdata(file); | 277 | struct az_device *az = video_drvdata(file); |
280 | struct az_device *az = video_get_drvdata(dev); | ||
281 | 278 | ||
282 | f->type = V4L2_TUNER_RADIO; | 279 | f->type = V4L2_TUNER_RADIO; |
283 | f->frequency = az->curfreq; | 280 | f->frequency = az->curfreq; |
@@ -303,8 +300,7 @@ static int vidioc_queryctrl (struct file *file, void *priv, | |||
303 | static int vidioc_g_ctrl (struct file *file, void *priv, | 300 | static int vidioc_g_ctrl (struct file *file, void *priv, |
304 | struct v4l2_control *ctrl) | 301 | struct v4l2_control *ctrl) |
305 | { | 302 | { |
306 | struct video_device *dev = video_devdata(file); | 303 | struct az_device *az = video_drvdata(file); |
307 | struct az_device *az = video_get_drvdata(dev); | ||
308 | 304 | ||
309 | switch (ctrl->id) { | 305 | switch (ctrl->id) { |
310 | case V4L2_CID_AUDIO_MUTE: | 306 | case V4L2_CID_AUDIO_MUTE: |
@@ -323,8 +319,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv, | |||
323 | static int vidioc_s_ctrl (struct file *file, void *priv, | 319 | static int vidioc_s_ctrl (struct file *file, void *priv, |
324 | struct v4l2_control *ctrl) | 320 | struct v4l2_control *ctrl) |
325 | { | 321 | { |
326 | struct video_device *dev = video_devdata(file); | 322 | struct az_device *az = video_drvdata(file); |
327 | struct az_device *az = video_get_drvdata(dev); | ||
328 | 323 | ||
329 | switch (ctrl->id) { | 324 | switch (ctrl->id) { |
330 | case V4L2_CID_AUDIO_MUTE: | 325 | case V4L2_CID_AUDIO_MUTE: |