On Wednesday, May 18, 2011 21:36:27 Ondrej Zary wrote:
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).
Just one comment left, see below...
Signed-off-by: Ondrej Zary linux@rainbow-software.org
--- linux-2.6.39-rc2-/include/sound/tea575x-tuner.h 2011-05-13 19:39:23.000000000 +0200 +++ linux-2.6.39-rc2/include/sound/tea575x-tuner.h 2011-05-17 22:35:19.000000000 +0200 @@ -23,8 +23,7 @@ */
#include <linux/videodev2.h> -#include <media/v4l2-dev.h> -#include <media/v4l2-ioctl.h> +#include <media/v4l2-ctrls.h>
#define TEA575X_FMIF 10700
@@ -54,6 +53,8 @@ struct snd_tea575x { void *private_data; u8 card[32]; u8 bus_info[32];
- struct v4l2_ctrl_handler ctrl_handler;
- void (*ext_init)(struct snd_tea575x *tea);
};
int snd_tea575x_init(struct snd_tea575x *tea); --- linux-2.6.39-rc2-/sound/i2c/other/tea575x-tuner.c 2011-05-13 19:39:23.000000000 +0200 +++ linux-2.6.39-rc2/sound/i2c/other/tea575x-tuner.c 2011-05-18 21:33:05.000000000 +0200 @@ -22,11 +22,11 @@
#include <asm/io.h> #include <linux/delay.h> -#include <linux/interrupt.h> #include <linux/init.h> #include <linux/slab.h> #include <linux/version.h> -#include <sound/core.h> +#include <media/v4l2-dev.h> +#include <media/v4l2-ioctl.h> #include <sound/tea575x-tuner.h>
MODULE_AUTHOR("Jaroslav Kysela perex@perex.cz"); @@ -62,17 +62,6 @@ module_param(radio_nr, int, 0); #define TEA575X_BIT_DUMMY (1<<15) /* buffer */ #define TEA575X_BIT_FREQ_MASK 0x7fff
-static struct v4l2_queryctrl radio_qctrl[] = {
- {
.id = V4L2_CID_AUDIO_MUTE,.name = "Mute",.minimum = 0,.maximum = 1,.default_value = 1,.type = V4L2_CTRL_TYPE_BOOLEAN,- }
-};
/*
- lowlevel part
*/ @@ -266,47 +255,17 @@ static int vidioc_s_audio(struct file *f return 0; }
-static int vidioc_queryctrl(struct file *file, void *priv,
struct v4l2_queryctrl *qc)+static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl) {
- int i;
- for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
if (qc->id && qc->id == radio_qctrl[i].id) {memcpy(qc, &(radio_qctrl[i]),sizeof(*qc));return 0;}- }
- return -EINVAL;
-}
-static int vidioc_g_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)-{
- struct snd_tea575x *tea = video_drvdata(file);
struct snd_tea575x *tea = container_of(ctrl->handler, struct snd_tea575x, ctrl_handler);
switch (ctrl->id) { case V4L2_CID_AUDIO_MUTE:
ctrl->value = tea->mute;
tea->mute = ctrl->val;snd_tea575x_set_freq(tea);
- return -EINVAL;
-}
-static int vidioc_s_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl)-{
struct snd_tea575x *tea = video_drvdata(file);
switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
if (tea->mute != ctrl->value) {tea->mute = ctrl->value;snd_tea575x_set_freq(tea);}return 0;} return -EINVAL;
}
@@ -355,9 +314,6 @@ static const struct v4l2_ioctl_ops tea57 .vidioc_s_input = vidioc_s_input, .vidioc_g_frequency = vidioc_g_frequency, .vidioc_s_frequency = vidioc_s_frequency,
- .vidioc_queryctrl = vidioc_queryctrl,
- .vidioc_g_ctrl = vidioc_g_ctrl,
- .vidioc_s_ctrl = vidioc_s_ctrl,
};
static struct video_device tea575x_radio = { @@ -367,6 +323,10 @@ static struct video_device tea575x_radio .release = video_device_release, };
+static const struct v4l2_ctrl_ops tea575x_ctrl_ops = {
- .s_ctrl = tea575x_s_ctrl,
+};
/*
- initialize all the tea575x chips
*/ @@ -384,31 +344,43 @@ int snd_tea575x_init(struct snd_tea575x tea->in_use = 0; tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40; tea->freq = 90500 * 16; /* 90.5Mhz default */
snd_tea575x_set_freq(tea);
tea575x_radio_inst = video_device_alloc();
video_device_alloc allocates the struct video_device. It would be easier to just embed that struct in the snd_tea575x struct. It prevents having to allocate memory twice and the test below can be removed entirely.
The .release field above can be set to video_device_release_empty, which is the appropriate release callback for embedded video_device structs.
- if (tea575x_radio_inst == NULL) {
if (!tea575x_radio_inst) { printk(KERN_ERR "tea575x-tuner: not enough memory\n"); return -ENOMEM; }
memcpy(tea575x_radio_inst, &tea575x_radio, sizeof(tea575x_radio));
strcpy(tea575x_radio.name, tea->tea5759 ?
"TEA5759 radio" : "TEA5757 radio");video_set_drvdata(tea575x_radio_inst, tea);
retval = video_register_device(tea575x_radio_inst,
VFL_TYPE_RADIO, radio_nr);
- v4l2_ctrl_handler_init(&tea->ctrl_handler, 1);
- tea575x_radio_inst->ctrl_handler = &tea->ctrl_handler;
- v4l2_ctrl_new_std(&tea->ctrl_handler, &tea575x_ctrl_ops, V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
- retval = tea->ctrl_handler.error; if (retval) {
printk(KERN_ERR "tea575x-tuner: can't register video device!\n");
printk(KERN_ERR "tea575x-tuner: can't initialize controls\n");v4l2_ctrl_handler_free(&tea->ctrl_handler);- v4l2_ctrl_handler_setup(&tea->ctrl_handler);
- if (tea->ext_init)
tea->ext_init(tea);
- snd_tea575x_set_freq(tea); tea->vd = tea575x_radio_inst;
- retval = video_register_device(tea575x_radio_inst, VFL_TYPE_RADIO, radio_nr);
- if (retval) {
printk(KERN_ERR "tea575x-tuner: can't register video device!\n");v4l2_ctrl_handler_free(&tea->ctrl_handler);
If you decide *not* to embed the video_device struct, then you have to call video_device_release() here to free the video_device struct, otherwise that memory will leak.
kfree(tea575x_radio_inst);tea->vd = NULL;return retval;- }
- return 0;
}
@@ -416,6 +388,7 @@ void snd_tea575x_exit(struct snd_tea575x { if (tea->vd) { video_unregister_device(tea->vd);
v4l2_ctrl_handler_free(&tea->ctrl_handler);}