diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-26 13:26:43 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-26 13:26:43 +0200 |
| commit | 9782f69f6d88cc756f9c0e0d01846779df901da8 (patch) | |
| tree | 23ac426153cabcb5c8944167d7db6bd12c12ac59 /linux/drivers/media/video/cx23885/cx23885-video.c | |
| parent | ddb6d77848776ec7f6b3135f2dfa5fbc1544b003 (diff) | |
| download | mediapointer-dvb-s2-9782f69f6d88cc756f9c0e0d01846779df901da8.tar.gz mediapointer-dvb-s2-9782f69f6d88cc756f9c0e0d01846779df901da8.tar.bz2 | |
v4l2-dev: remove unused type and type2 field from video_device
From: Hans Verkuil <hverkuil@xs4all.nl>
The type and type2 fields were unused and so could be removed.
Instead add a vfl_type field that contains the type of the video
device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-video.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-video.c b/linux/drivers/media/video/cx23885/cx23885-video.c index 8a77f2633..3f1765de0 100644 --- a/linux/drivers/media/video/cx23885/cx23885-video.c +++ b/linux/drivers/media/video/cx23885/cx23885-video.c @@ -1680,7 +1680,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { static struct video_device cx23885_vbi_template; static struct video_device cx23885_video_template = { .name = "cx23885-video", - .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES, .fops = &video_fops, .minor = -1, .ioctl_ops = &video_ioctl_ops, @@ -1698,11 +1697,7 @@ static const struct file_operations radio_fops = { }; #if 0 -static struct video_device cx23885_radio_template = { - .name = "cx23885-radio", - .type = VID_TYPE_TUNER, - .fops = &radio_fops, - .minor = -1, +static const struct v4l2_ioctl_ops radio_ioctl_ops = { .vidioc_querycap = radio_querycap, .vidioc_g_tuner = radio_g_tuner, .vidioc_enum_input = radio_enum_input, @@ -1716,6 +1711,13 @@ static struct video_device cx23885_radio_template = { .vidioc_g_frequency = vidioc_g_frequency, .vidioc_s_frequency = vidioc_s_frequency, }; + +static struct video_device cx23885_radio_template = { + .name = "cx23885-radio", + .fops = &radio_fops, + .ioctl_ops = &radio_ioctl_ops, + .minor = -1, +}; #endif void cx23885_video_unregister(struct cx23885_dev *dev) @@ -1762,7 +1764,6 @@ int cx23885_video_register(struct cx23885_dev *dev) memcpy(&cx23885_vbi_template, &cx23885_video_template, sizeof(cx23885_vbi_template)); strcpy(cx23885_vbi_template.name, "cx23885-vbi"); - cx23885_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER; dev->tvnorm = cx23885_video_template.current_norm; |