diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-23 06:24:07 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:54 -0400 |
commit | 601e9444f249d219009ec05674268d90f6f1cdcb (patch) | |
tree | 42d58813872e340e03a40b74922ea89dfdcf0c55 /drivers/media/radio/radio-aimslab.c | |
parent | e138c592b50370621653fd962b2bc3f4e25dfe78 (diff) |
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>
Diffstat (limited to 'drivers/media/radio/radio-aimslab.c')
-rw-r--r-- | drivers/media/radio/radio-aimslab.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c index 59fdaf85e41b..62cc6874d63f 100644 --- a/drivers/media/radio/radio-aimslab.c +++ b/drivers/media/radio/radio-aimslab.c | |||
@@ -247,7 +247,7 @@ static int vidioc_g_tuner(struct file *file, void *priv, | |||
247 | struct v4l2_tuner *v) | 247 | struct v4l2_tuner *v) |
248 | { | 248 | { |
249 | struct video_device *dev = video_devdata(file); | 249 | struct video_device *dev = video_devdata(file); |
250 | struct rt_device *rt = dev->priv; | 250 | struct rt_device *rt = video_get_drvdata(dev); |
251 | 251 | ||
252 | if (v->index > 0) | 252 | if (v->index > 0) |
253 | return -EINVAL; | 253 | return -EINVAL; |
@@ -275,7 +275,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, | |||
275 | struct v4l2_frequency *f) | 275 | struct v4l2_frequency *f) |
276 | { | 276 | { |
277 | struct video_device *dev = video_devdata(file); | 277 | struct video_device *dev = video_devdata(file); |
278 | struct rt_device *rt = dev->priv; | 278 | struct rt_device *rt = video_get_drvdata(dev); |
279 | 279 | ||
280 | rt->curfreq = f->frequency; | 280 | rt->curfreq = f->frequency; |
281 | rt_setfreq(rt, rt->curfreq); | 281 | rt_setfreq(rt, rt->curfreq); |
@@ -286,7 +286,7 @@ static int vidioc_g_frequency(struct file *file, void *priv, | |||
286 | struct v4l2_frequency *f) | 286 | struct v4l2_frequency *f) |
287 | { | 287 | { |
288 | struct video_device *dev = video_devdata(file); | 288 | struct video_device *dev = video_devdata(file); |
289 | struct rt_device *rt = dev->priv; | 289 | struct rt_device *rt = video_get_drvdata(dev); |
290 | 290 | ||
291 | f->type = V4L2_TUNER_RADIO; | 291 | f->type = V4L2_TUNER_RADIO; |
292 | f->frequency = rt->curfreq; | 292 | f->frequency = rt->curfreq; |
@@ -312,7 +312,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv, | |||
312 | struct v4l2_control *ctrl) | 312 | struct v4l2_control *ctrl) |
313 | { | 313 | { |
314 | struct video_device *dev = video_devdata(file); | 314 | struct video_device *dev = video_devdata(file); |
315 | struct rt_device *rt = dev->priv; | 315 | struct rt_device *rt = video_get_drvdata(dev); |
316 | 316 | ||
317 | switch (ctrl->id) { | 317 | switch (ctrl->id) { |
318 | case V4L2_CID_AUDIO_MUTE: | 318 | case V4L2_CID_AUDIO_MUTE: |
@@ -329,7 +329,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv, | |||
329 | struct v4l2_control *ctrl) | 329 | struct v4l2_control *ctrl) |
330 | { | 330 | { |
331 | struct video_device *dev = video_devdata(file); | 331 | struct video_device *dev = video_devdata(file); |
332 | struct rt_device *rt = dev->priv; | 332 | struct rt_device *rt = video_get_drvdata(dev); |
333 | 333 | ||
334 | switch (ctrl->id) { | 334 | switch (ctrl->id) { |
335 | case V4L2_CID_AUDIO_MUTE: | 335 | case V4L2_CID_AUDIO_MUTE: |
@@ -437,7 +437,7 @@ static int __init rtrack_init(void) | |||
437 | return -EBUSY; | 437 | return -EBUSY; |
438 | } | 438 | } |
439 | 439 | ||
440 | rtrack_radio.priv=&rtrack_unit; | 440 | video_set_drvdata(&rtrack_radio, &rtrack_unit); |
441 | 441 | ||
442 | if (video_register_device(&rtrack_radio, VFL_TYPE_RADIO, radio_nr) < 0) { | 442 | if (video_register_device(&rtrack_radio, VFL_TYPE_RADIO, radio_nr) < 0) { |
443 | release_region(io, 2); | 443 | release_region(io, 2); |