diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2011-05-23 09:17:19 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 17:52:20 -0300 |
commit | 4522e825dbfc19537a08f65719dc3d69c46fe661 (patch) | |
tree | 174e008ad224d01104f92e4e247431c749c91d6a /include | |
parent | 2ef403708880c6e00854fb81bbffb9a4036327e6 (diff) | |
download | linux-3.10-4522e825dbfc19537a08f65719dc3d69c46fe661.tar.gz linux-3.10-4522e825dbfc19537a08f65719dc3d69c46fe661.tar.bz2 linux-3.10-4522e825dbfc19537a08f65719dc3d69c46fe661.zip |
[media] tea575x: convert to control framework
Convert tea575x-tuner to use the new V4L2 control framework. Also add
ext_init() callback that can be used by a card driver for additional
initialization right before registering the video device (for SF16-FMR2).
Also embed struct video_device to struct snd_tea575x to simplify the code.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/tea575x-tuner.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h index d2ea112fc20..5aa8186e782 100644 --- a/include/sound/tea575x-tuner.h +++ b/include/sound/tea575x-tuner.h @@ -23,8 +23,8 @@ */ #include <linux/videodev2.h> +#include <media/v4l2-ctrls.h> #include <media/v4l2-dev.h> -#include <media/v4l2-ioctl.h> #define TEA575X_FMIF 10700 @@ -42,7 +42,7 @@ struct snd_tea575x_ops { }; struct snd_tea575x { - struct video_device *vd; /* video device */ + struct video_device vd; /* video device */ bool tea5759; /* 5759 chip is present */ bool mute; /* Device is muted? */ bool stereo; /* receiving stereo */ @@ -54,6 +54,8 @@ struct snd_tea575x { void *private_data; u8 card[32]; u8 bus_info[32]; + struct v4l2_ctrl_handler ctrl_handler; + int (*ext_init)(struct snd_tea575x *tea); }; int snd_tea575x_init(struct snd_tea575x *tea); |