diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-21 01:57:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 11:54:58 -0400 |
commit | a399810ca69d9d4bd30ab8c1678c7439e567f90b (patch) | |
tree | 32939ef77bc75c3a224d37cf4e885d7f808741bf /drivers/media/radio/radio-aztech.c | |
parent | b654fcdc0ea3b6e5724c9873ae062bdfe7f28efe (diff) |
V4L/DVB (8482): videodev: move all ioctl callbacks to a new v4l2_ioctl_ops struct
All ioctl callbacks are now stored in a new v4l2_ioctl_ops struct. Drivers fill in
a const struct v4l2_ioctl_ops and video_device just contains a const pointer to it.
This ensures a clean separation between the const ops struct and the non-const
video_device struct.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/radio/radio-aztech.c')
-rw-r--r-- | drivers/media/radio/radio-aztech.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index 639164a974a1..04c738b62d06 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c | |||
@@ -353,12 +353,7 @@ static const struct file_operations aztech_fops = { | |||
353 | .llseek = no_llseek, | 353 | .llseek = no_llseek, |
354 | }; | 354 | }; |
355 | 355 | ||
356 | static struct video_device aztech_radio= | 356 | static const struct v4l2_ioctl_ops aztech_ioctl_ops = { |
357 | { | ||
358 | .owner = THIS_MODULE, | ||
359 | .name = "Aztech radio", | ||
360 | .type = VID_TYPE_TUNER, | ||
361 | .fops = &aztech_fops, | ||
362 | .vidioc_querycap = vidioc_querycap, | 357 | .vidioc_querycap = vidioc_querycap, |
363 | .vidioc_g_tuner = vidioc_g_tuner, | 358 | .vidioc_g_tuner = vidioc_g_tuner, |
364 | .vidioc_s_tuner = vidioc_s_tuner, | 359 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -373,6 +368,14 @@ static struct video_device aztech_radio= | |||
373 | .vidioc_s_ctrl = vidioc_s_ctrl, | 368 | .vidioc_s_ctrl = vidioc_s_ctrl, |
374 | }; | 369 | }; |
375 | 370 | ||
371 | static struct video_device aztech_radio = { | ||
372 | .owner = THIS_MODULE, | ||
373 | .name = "Aztech radio", | ||
374 | .type = VID_TYPE_TUNER, | ||
375 | .fops = &aztech_fops, | ||
376 | .ioctl_ops = &aztech_ioctl_ops, | ||
377 | }; | ||
378 | |||
376 | module_param_named(debug,aztech_radio.debug, int, 0644); | 379 | module_param_named(debug,aztech_radio.debug, int, 0644); |
377 | MODULE_PARM_DESC(debug,"activates debug info"); | 380 | MODULE_PARM_DESC(debug,"activates debug info"); |
378 | 381 | ||