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-cadet.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-cadet.c')
-rw-r--r-- | drivers/media/radio/radio-cadet.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index 484ea87d7fba..36b850fc14b4 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c | |||
@@ -570,12 +570,7 @@ static const struct file_operations cadet_fops = { | |||
570 | .llseek = no_llseek, | 570 | .llseek = no_llseek, |
571 | }; | 571 | }; |
572 | 572 | ||
573 | static struct video_device cadet_radio= | 573 | static const struct v4l2_ioctl_ops cadet_ioctl_ops = { |
574 | { | ||
575 | .owner = THIS_MODULE, | ||
576 | .name = "Cadet radio", | ||
577 | .type = VID_TYPE_TUNER, | ||
578 | .fops = &cadet_fops, | ||
579 | .vidioc_querycap = vidioc_querycap, | 574 | .vidioc_querycap = vidioc_querycap, |
580 | .vidioc_g_tuner = vidioc_g_tuner, | 575 | .vidioc_g_tuner = vidioc_g_tuner, |
581 | .vidioc_s_tuner = vidioc_s_tuner, | 576 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -590,6 +585,14 @@ static struct video_device cadet_radio= | |||
590 | .vidioc_s_input = vidioc_s_input, | 585 | .vidioc_s_input = vidioc_s_input, |
591 | }; | 586 | }; |
592 | 587 | ||
588 | static struct video_device cadet_radio = { | ||
589 | .owner = THIS_MODULE, | ||
590 | .name = "Cadet radio", | ||
591 | .type = VID_TYPE_TUNER, | ||
592 | .fops = &cadet_fops, | ||
593 | .ioctl_ops = &cadet_ioctl_ops, | ||
594 | }; | ||
595 | |||
593 | #ifdef CONFIG_PNP | 596 | #ifdef CONFIG_PNP |
594 | 597 | ||
595 | static struct pnp_device_id cadet_pnp_devices[] = { | 598 | static struct pnp_device_id cadet_pnp_devices[] = { |