From patchwork Wed Mar 20 19:24:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Frank_Sch=C3=A4fer?= X-Patchwork-Id: 2309481 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id BC257DF24C for ; Wed, 20 Mar 2013 19:24:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757913Ab3CTTYb (ORCPT ); Wed, 20 Mar 2013 15:24:31 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:45614 "EHLO mail-ee0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757893Ab3CTTYQ (ORCPT ); Wed, 20 Mar 2013 15:24:16 -0400 Received: by mail-ee0-f45.google.com with SMTP id b57so1375529eek.32 for ; Wed, 20 Mar 2013 12:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=EJyWbYS2HwrSoe4QQm5yR3wnrn2QxKTSKID46bHo/+U=; b=uoRih8BL7N9h+/fFCgHPrPb3RCBrfcABdJwsBXoK4skNyhyJZwtn6tN+GyqqTsqNV/ nfq4BgTn7RSdfcov/l8JkAfCSOCo5qJzp58yRUOiEFPj7zbpN9kL5fnmPqpdUmVk/Hbi QoWy2nAf/c/giHRnQdfLn+6gqpFg5KCTQMSfE1UbvxBBm89HwFDlD+4x436mn3k+u4RQ rgX0p+a+2OHqOY16hnH0T+vp5emufWwK/E9Gly6WHcsZtR/iHyy52X5vGPNROeB5/nGT ruVghr04AphwGk97yAostEnTsQ9i7ocyT6l8orzSBD4m+726D0SzFYPouZBcXjb8gjbj jAgA== X-Received: by 10.14.200.137 with SMTP id z9mr74303076een.20.1363807455210; Wed, 20 Mar 2013 12:24:15 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-109-91-213-156.unitymediagroup.de. [109.91.213.156]) by mx.google.com with ESMTPS id z45sm4408888eeu.10.2013.03.20.12.24.14 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Mar 2013 12:24:14 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: hverkuil@xs4all.nl, linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [RFC PATCH 06/10] bttv: untangle audio input and mute setting Date: Wed, 20 Mar 2013 20:24:46 +0100 Message-Id: <1363807490-3906-7-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363807490-3906-1-git-send-email-fschaefer.oss@googlemail.com> References: <1363807490-3906-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Split function audio_mux(): move the mute setting part to function audio_mute() and the input setting part to function audio_input(). Signed-off-by: Frank Schäfer Acked-by: Hans Verkuil --- drivers/media/pci/bt8xx/bttv-driver.c | 51 ++++++++++++++++----------------- 1 Datei geändert, 24 Zeilen hinzugefügt(+), 27 Zeilen entfernt(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index f1cb0db..0df4a16 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -1022,18 +1022,37 @@ audio_mux_gpio(struct bttv *btv, int input, int mute) } static int -audio_mux(struct bttv *btv, int input, int mute) +audio_mute(struct bttv *btv, int mute) { struct v4l2_ctrl *ctrl; - audio_mux_gpio(btv, input, mute); + audio_mux_gpio(btv, btv->audio_input, mute); if (btv->sd_msp34xx) { - u32 in; - ctrl = v4l2_ctrl_find(btv->sd_msp34xx->ctrl_handler, V4L2_CID_AUDIO_MUTE); if (ctrl) v4l2_ctrl_s_ctrl(ctrl, mute); + } + if (btv->sd_tvaudio) { + ctrl = v4l2_ctrl_find(btv->sd_tvaudio->ctrl_handler, V4L2_CID_AUDIO_MUTE); + if (ctrl) + v4l2_ctrl_s_ctrl(ctrl, mute); + } + if (btv->sd_tda7432) { + ctrl = v4l2_ctrl_find(btv->sd_tda7432->ctrl_handler, V4L2_CID_AUDIO_MUTE); + if (ctrl) + v4l2_ctrl_s_ctrl(ctrl, mute); + } + return 0; +} + +static int +audio_input(struct bttv *btv, int input) +{ + audio_mux_gpio(btv, input, btv->mute); + + if (btv->sd_msp34xx) { + u32 in; /* Note: the inputs tuner/radio/extern/intern are translated to msp routings. This assumes common behavior for all msp3400 @@ -1079,34 +1098,12 @@ audio_mux(struct bttv *btv, int input, int mute) in, MSP_OUTPUT_DEFAULT, 0); } if (btv->sd_tvaudio) { - ctrl = v4l2_ctrl_find(btv->sd_tvaudio->ctrl_handler, V4L2_CID_AUDIO_MUTE); - - if (ctrl) - v4l2_ctrl_s_ctrl(ctrl, mute); v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing, - input, 0, 0); - } - if (btv->sd_tda7432) { - ctrl = v4l2_ctrl_find(btv->sd_tda7432->ctrl_handler, V4L2_CID_AUDIO_MUTE); - - if (ctrl) - v4l2_ctrl_s_ctrl(ctrl, mute); + input, 0, 0); } return 0; } -static inline int -audio_mute(struct bttv *btv, int mute) -{ - return audio_mux(btv, btv->audio_input, mute); -} - -static inline int -audio_input(struct bttv *btv, int input) -{ - return audio_mux(btv, input, btv->mute); -} - static void bttv_crop_calc_limits(struct bttv_crop *c) {