diff options
Diffstat (limited to 'drivers/media/radio/radio-aztech.c')
-rw-r--r-- | drivers/media/radio/radio-aztech.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index ddd96295a9fe..5dd5e349ef47 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c | |||
@@ -197,7 +197,7 @@ 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 video_device *dev = video_devdata(file); |
200 | struct az_device *az = dev->priv; | 200 | struct az_device *az = video_get_drvdata(dev); |
201 | 201 | ||
202 | if (v->index > 0) | 202 | if (v->index > 0) |
203 | return -EINVAL; | 203 | return -EINVAL; |
@@ -266,7 +266,7 @@ static int vidioc_s_frequency (struct file *file, void *priv, | |||
266 | struct v4l2_frequency *f) | 266 | struct v4l2_frequency *f) |
267 | { | 267 | { |
268 | struct video_device *dev = video_devdata(file); | 268 | struct video_device *dev = video_devdata(file); |
269 | struct az_device *az = dev->priv; | 269 | struct az_device *az = video_get_drvdata(dev); |
270 | 270 | ||
271 | az->curfreq = f->frequency; | 271 | az->curfreq = f->frequency; |
272 | az_setfreq(az, az->curfreq); | 272 | az_setfreq(az, az->curfreq); |
@@ -277,7 +277,7 @@ static int vidioc_g_frequency (struct file *file, void *priv, | |||
277 | struct v4l2_frequency *f) | 277 | struct v4l2_frequency *f) |
278 | { | 278 | { |
279 | struct video_device *dev = video_devdata(file); | 279 | struct video_device *dev = video_devdata(file); |
280 | struct az_device *az = dev->priv; | 280 | struct az_device *az = video_get_drvdata(dev); |
281 | 281 | ||
282 | f->type = V4L2_TUNER_RADIO; | 282 | f->type = V4L2_TUNER_RADIO; |
283 | f->frequency = az->curfreq; | 283 | f->frequency = az->curfreq; |
@@ -304,7 +304,7 @@ static int vidioc_g_ctrl (struct file *file, void *priv, | |||
304 | struct v4l2_control *ctrl) | 304 | struct v4l2_control *ctrl) |
305 | { | 305 | { |
306 | struct video_device *dev = video_devdata(file); | 306 | struct video_device *dev = video_devdata(file); |
307 | struct az_device *az = dev->priv; | 307 | struct az_device *az = video_get_drvdata(dev); |
308 | 308 | ||
309 | switch (ctrl->id) { | 309 | switch (ctrl->id) { |
310 | case V4L2_CID_AUDIO_MUTE: | 310 | case V4L2_CID_AUDIO_MUTE: |
@@ -324,7 +324,7 @@ static int vidioc_s_ctrl (struct file *file, void *priv, | |||
324 | struct v4l2_control *ctrl) | 324 | struct v4l2_control *ctrl) |
325 | { | 325 | { |
326 | struct video_device *dev = video_devdata(file); | 326 | struct video_device *dev = video_devdata(file); |
327 | struct az_device *az = dev->priv; | 327 | struct az_device *az = video_get_drvdata(dev); |
328 | 328 | ||
329 | switch (ctrl->id) { | 329 | switch (ctrl->id) { |
330 | case V4L2_CID_AUDIO_MUTE: | 330 | case V4L2_CID_AUDIO_MUTE: |
@@ -405,7 +405,7 @@ static int __init aztech_init(void) | |||
405 | } | 405 | } |
406 | 406 | ||
407 | mutex_init(&lock); | 407 | mutex_init(&lock); |
408 | aztech_radio.priv=&aztech_unit; | 408 | video_set_drvdata(&aztech_radio, &aztech_unit); |
409 | 409 | ||
410 | if (video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr) < 0) { | 410 | if (video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr) < 0) { |
411 | release_region(io,2); | 411 | release_region(io,2); |