From patchwork Tue May 29 10:18:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 137149 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3860969lji; Tue, 29 May 2018 03:21:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJhsycq0lvCFKyeXPeWgCS3MGYLr2wHv3bMyAJjo1uViiCAWdiWp813sZzmJfwR3iYo4DFp X-Received: by 2002:a1c:c702:: with SMTP id x2-v6mr12809121wmf.57.1527589276854; Tue, 29 May 2018 03:21:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527589276; cv=none; d=google.com; s=arc-20160816; b=rVCw69cXfpe1iXC4qJZWzmHgg0Ab+qo3SdT5V6U+13v8qowOodmIEVVhDw9IIWPp5p fYnwlh+5vIbJ5NK/N8fmWgNt2QV65Cpxfs+1/O8eDKLlgTWXu7SioyxZSkmNqQgJ7jeW AMLSh7NS1nC2NxmAdACDRPw3bIW8lwuYKaMpl0yn97/iv6VRjldF8mswSPfS6SQkjXD0 I76B2t3LTOmrm1OOe0kJJxiY4ONUaTSFeHROuiWZDE4ORhcS0GduYgfUJt7to3dcZwqp Tb4HEuuWxlz9KTf8HbquWau85leyyUFSlmEWaLSyM7x7HhabBu3HMaaBDNzjnN014mbF JnhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=lbU7s00UwUi3jp5s0aGfCR9NkXQ8Eq8+ErOld4gwIsg=; b=nFNx3Jxas7sL3CeCKd+1KYuYVb91sviaTmp2Z9eNRqZKosg6Tgy5mOhY2V0msz2lSc ega7bl8ozqtQnTa4j/MLPjS62cbf2wR/6lE/O4O+YqGLn6F7M4HNvnMArJy+LHQnGQpV CwlQ5NWgCWhDc14/8DnpdBGUWXZb4u6GjBy0kqje8+/2Mh/qFC30iXUCr7FbETrq2Bn7 EkcB8DQcR/Xo/QaBMsMmgW934gwgGRYAl6MwFNRPiKCNnTMeYPOKdiulU9CGQI7aYT/n WMYT5Fieq6rMMgfVH7wGJBt/VFIOzJZGvLaPlcq7Wgyqn2cul4UeeAS42Qd2fOyf+RPK WMdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=P+NoU39R; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id f9-v6si27055711wrc.201.2018.05.29.03.21.16; Tue, 29 May 2018 03:21:16 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=P+NoU39R; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6EC562676B2; Tue, 29 May 2018 12:21:03 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D6DDC267645; Tue, 29 May 2018 12:20:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=disabled version=3.4.0 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by alsa0.perex.cz (Postfix) with ESMTP id 406922671EE for ; Tue, 29 May 2018 12:20:56 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id i14-v6so24533831wre.2 for ; Tue, 29 May 2018 03:20:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bW+9ST8toUlXAFZ70AykoH2+2+K96WTJIwTYBYkWJVE=; b=P+NoU39R2ckPPiWXmkEyY3j1Y92Zgqdr+cH69QQ4hIvuILwcuQtRp21rp7y+xVssEX +6V7I56Pc/lzBTG6W+zDWTnnMopLlhEQnKvVqt/AcNIayx/7zUQ/Q2ADs1ZXJyy4CEEd TsXl/rvWiI3ihciiijeUqvAewXWtBApkZ8WZY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bW+9ST8toUlXAFZ70AykoH2+2+K96WTJIwTYBYkWJVE=; b=ViEMrdpSEDh06A1zrmN6nkhIydxEy8ZYX+t9Musf7POIbWiNVqpYuz1OpUMv5Nk/HQ YmSz2P0YF1r1SrYOTVl5w3BgbO5BiT3hdHJUXKWpHO32S24gTG9RE8gkq8gMyRz2fv+W zoLVlp1hUKhLCwSjn/FziLMPQo0sU40bjL4g1qpBwMWp/IkZPNde9VLaMUH0sVRxp2jJ ecy4ckqtwjQhCkU/pH3WM+MgsDrKOHRDbpxb2Sa2cLY7lriQiB92CXhmMnShX55R5l2u ldipXzJ7ohr05Krrq1ynDP7tNwnhLFoBMOcQC+M2zmRsOcS1gHxSfC8k0BYxOKRzOEiJ Vb2g== X-Gm-Message-State: ALKqPwfa7ZVCyZ2HEbNjIt9f40EIfoWFh0zSiKlDIsOVnFwJDY/zIYFP BJs525hsDkoq8MYuehNgt7DsQQ== X-Received: by 2002:adf:bc8f:: with SMTP id g15-v6mr13043849wrh.266.1527589255737; Tue, 29 May 2018 03:20:55 -0700 (PDT) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id 60-v6sm23825021wrc.42.2018.05.29.03.20.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 May 2018 03:20:55 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, robh+dt@kernel.org, bgoswami@codeaurora.org Date: Tue, 29 May 2018 11:18:30 +0100 Message-Id: <20180529101833.30489-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180529101833.30489-1-srinivas.kandagatla@linaro.org> References: <20180529101833.30489-1-srinivas.kandagatla@linaro.org> Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, rohkumar@qti.qualcomm.com, linux-kernel@vger.kernel.org, plai@codeaurora.org, tiwai@suse.com, lgirdwood@gmail.com, Srinivas Kandagatla , spatakok@qti.qualcomm.com, linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH 3/6] ASoC: qdsp6: q6afe-dai: use q6afe_dai_prepare() for MI2S X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org Use common q6afe_dai_prepare() for MI2S dais, this will remove some code duplication. Also make the if statement to switch to make the code look neater. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6afe-dai.c | 53 ++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 35 deletions(-) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c index 4378e29a95c5..e529edfd8001 100644 --- a/sound/soc/qcom/qdsp6/q6afe-dai.c +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c @@ -144,38 +144,6 @@ static void q6afe_dai_shutdown(struct snd_pcm_substream *substream, } -static int q6afe_mi2s_prepare(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct q6afe_dai_data *dai_data = dev_get_drvdata(dai->dev); - int rc; - - if (dai_data->is_port_started[dai->id]) { - /* stop the port and restart with new port config */ - rc = q6afe_port_stop(dai_data->port[dai->id]); - if (rc < 0) { - dev_err(dai->dev, "fail to close AFE port (%d)\n", rc); - return rc; - } - } - - rc = q6afe_i2s_port_prepare(dai_data->port[dai->id], - &dai_data->port_config[dai->id].i2s_cfg); - if (rc < 0) { - dev_err(dai->dev, "fail to prepare AFE port %x\n", dai->id); - return rc; - } - - rc = q6afe_port_start(dai_data->port[dai->id]); - if (rc < 0) { - dev_err(dai->dev, "fail to start AFE port %x\n", dai->id); - return rc; - } - dai_data->is_port_started[dai->id] = true; - - return 0; -} - static int q6afe_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -191,12 +159,27 @@ static int q6afe_dai_prepare(struct snd_pcm_substream *substream, } } - if (dai->id == HDMI_RX) + switch (dai->id) { + case HDMI_RX: q6afe_hdmi_port_prepare(dai_data->port[dai->id], &dai_data->port_config[dai->id].hdmi); - else if (dai->id >= SLIMBUS_0_RX && dai->id <= SLIMBUS_6_TX) + break; + case SLIMBUS_0_RX ... SLIMBUS_6_TX: q6afe_slim_port_prepare(dai_data->port[dai->id], &dai_data->port_config[dai->id].slim); + break; + case PRIMARY_MI2S_RX ... QUATERNARY_MI2S_TX: + rc = q6afe_i2s_port_prepare(dai_data->port[dai->id], + &dai_data->port_config[dai->id].i2s_cfg); + if (rc < 0) { + dev_err(dai->dev, "fail to prepare AFE port %x\n", + dai->id); + return rc; + } + break; + default: + return -EINVAL; + } rc = q6afe_port_start(dai_data->port[dai->id]); if (rc < 0) { @@ -289,7 +272,7 @@ static struct snd_soc_dai_ops q6hdmi_ops = { }; static struct snd_soc_dai_ops q6i2s_ops = { - .prepare = q6afe_mi2s_prepare, + .prepare = q6afe_dai_prepare, .hw_params = q6i2s_hw_params, .set_fmt = q6i2s_set_fmt, .shutdown = q6afe_dai_shutdown,