From patchwork Sun May 15 19:41:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 786362 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4FJfSKJ021060 for ; Sun, 15 May 2011 19:41:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751867Ab1EOTlS (ORCPT ); Sun, 15 May 2011 15:41:18 -0400 Received: from mail1-out1.atlantis.sk ([80.94.52.55]:58457 "EHLO mail.atlantis.sk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751388Ab1EOTlR (ORCPT ); Sun, 15 May 2011 15:41:17 -0400 Received: (qmail 6286 invoked from network); 15 May 2011 19:41:17 -0000 Received: from unknown (HELO pentium) (rainbow@rainbow-software.org@85.216.180.141) by mail.atlantis.sk with AES256-SHA encrypted SMTP; 15 May 2011 19:41:17 -0000 From: Ondrej Zary To: Hans Verkuil Subject: [PATCH RFC] tea575x: convert to control framework Date: Sun, 15 May 2011 21:41:01 +0200 User-Agent: KMail/1.9.10 Cc: linux-media@vger.kernel.org, alsa-devel@alsa-project.org, "Kernel development list" References: <201105140017.26968.linux@rainbow-software.org> <201105141206.51832.hverkuil@xs4all.nl> In-Reply-To: <201105141206.51832.hverkuil@xs4all.nl> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201105152141.05415.linux@rainbow-software.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 15 May 2011 19:41:29 +0000 (UTC) Convert tea575x-tuner to use the new V4L2 control framework. Signed-off-by: Ondrej Zary --- 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-15 20:34:54.000000000 +0200 @@ -23,8 +23,7 @@ */ #include -#include -#include +#include #define TEA575X_FMIF 10700 @@ -54,6 +53,7 @@ struct snd_tea575x { void *private_data; u8 card[32]; u8 bus_info[32]; + struct v4l2_ctrl_handler ctrl_handler; }; 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-15 20:34:23.000000000 +0200 @@ -22,11 +22,11 @@ #include #include -#include #include #include #include -#include +#include +#include #include MODULE_AUTHOR("Jaroslav Kysela "); @@ -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,19 @@ 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; - return 0; - } - 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; + if (tea->mute != ctrl->val) { + tea->mute = ctrl->val; snd_tea575x_set_freq(tea); } return 0; } + return -EINVAL; } @@ -355,9 +316,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 +325,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 */ @@ -406,6 +368,17 @@ int snd_tea575x_init(struct snd_tea575x return retval; } + 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) { + v4l2_ctrl_handler_free(&tea->ctrl_handler); + kfree(tea575x_radio_inst); + return retval; + } + v4l2_ctrl_handler_setup(&tea->ctrl_handler); + snd_tea575x_set_freq(tea); tea->vd = tea575x_radio_inst; @@ -415,6 +388,7 @@ int snd_tea575x_init(struct snd_tea575x void snd_tea575x_exit(struct snd_tea575x *tea) { if (tea->vd) { + v4l2_ctrl_handler_free(&tea->ctrl_handler); video_unregister_device(tea->vd); tea->vd = NULL; }