From patchwork Mon May 6 09:58:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 163390 Delivered-To: patch@linaro.org Received: by 2002:a92:3d95:0:0:0:0:0 with SMTP id k21csp1650151ilf; Mon, 6 May 2019 02:58:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4BIgp4EC+DmtlawWS/d7Xha9FDNP9E5VHPKNbFXGv0qZifNCn+CDFzooYDPFeeiBwByx9 X-Received: by 2002:a17:902:bb96:: with SMTP id m22mr5991634pls.5.1557136707217; Mon, 06 May 2019 02:58:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557136707; cv=none; d=google.com; s=arc-20160816; b=UIGvAQx9WQEtqsWDNkkcgso4TxslTI3Ks7NpwqDtm60vgEr0yS+pfaVs/kvMh1VpAN UNWr4Zsbx4f13yg2+/FgyPpOoPvBPLOnwYNdHWUnUq1Cy8m6ahFysxjgR6S42e7H9GBw JdPXL6DBc+N+DL5p0gxPD/kFP4p90sp3obPEEDlleQryVnCx1EZFgSCR4PdZJiXI6pFv If6RkySxEw/zakliqWIcyJoutU22Q5iixJgc0LIAAYJVoFM2wbpmMAepa47BSurc4o3A Nn6Cmiob6Hq1Gv1aTHZ1lCTarMqPxsILWxACAheAvp+SqYNpn5CQVbfkk4twW6f3RWxz WHLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dfLtGNFClAo6TII3XvesnrIEXOA3C3N3iJ8W2ZBUhMY=; b=oRcIBDCqxIaVPQ0l4LKrcQoMkOWIQgTpWVb9pram+jGWZAKHKNLkWEv+4TmjYpCgEO GGFBOVTICde9kd93WGOIulw5uknVQSx8JUSlwDnU1qmvDrhrwi39IunMzxl2P+TWHtzQ bxDF9ByLR4IDK472lM1EMtpwVZujvdTGsI6QNh8lr52pIsuzQfw8KovvclCh9wuFK4rF ROdSJq15aYbzIKa0r+YPJHCIgP9S2hRhO+LjTHuC91akiQk53TH/Qq9r9TwjQ8bUbQ+2 /oiJQgSOI1k47Oab4xZJn2VTlIFYFPmTRN79ES4cit25znx7+qYamWyWA+CkN2/pOcP1 ewxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=AndrexMZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v7si11185757pgb.40.2019.05.06.02.58.26; Mon, 06 May 2019 02:58:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=AndrexMZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726349AbfEFJ6Z (ORCPT + 30 others); Mon, 6 May 2019 05:58:25 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:33986 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725856AbfEFJ6Y (ORCPT ); Mon, 6 May 2019 05:58:24 -0400 Received: by mail-wr1-f67.google.com with SMTP id f7so6113571wrq.1 for ; Mon, 06 May 2019 02:58:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dfLtGNFClAo6TII3XvesnrIEXOA3C3N3iJ8W2ZBUhMY=; b=AndrexMZaltXMXLQICjUp7CV9V4Mp7tlXc1teK2aYdDDsqAYZ2XPSpQntKBfOyEKDY +gvcG8eud5mk0ltvrTQi9Q/S1CblmXA0+1qoJxiuzXDIfTxhpdWdSoYwY+oCW0E6S6sR DLBQB2PM9EG/5ruV9Hlmw0ATywSf+JpzT0VQYMw717AUIlQ/s+ZrqRiev7kjs5NyYE7t mJ0M9fkJJowP5MXW+Ut5eQCKV2QW5pMvaMs3T9VfPxqlh3+9zMdbbRLXgwtlTJjovFVV jgdWJGg+fw0/RN1PZyCfU18SKPvjeIo+e/Z9uIDEfGePi/orcdkcQWZJbPfUbypibZsx f9Vg== 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:mime-version:content-transfer-encoding; bh=dfLtGNFClAo6TII3XvesnrIEXOA3C3N3iJ8W2ZBUhMY=; b=UjAQM77UMRP+tmO2Tt4CskQMoJ4bvrpY4IUdMHdM8uBYk4RVG8I5XMFKN5/N9lCpvF NHMJxebTwUN2DzYJ6NLmDLjAGaxzQNroy8PctV5oS4P9OhdxXMHe4DqDB19NzpOoC/g3 3NlyD388diFPbH4504Wily/hYfKZvkmD+ihQa3I4d3Ms+PQKFg4QTprBIDyNmzVK+msO 0NOC1wUD3O0UdE/kSI+N9t+Rp+gsB/Tg+njjI1OrSgUPyMpkVqcKoSV8hehD6vfGCJn0 SwFZC9UCsJIb7WF30qBvRH0XxzORa6f0J+TdnFeJmZj3aoYSYOolPsgzWXia1ouYION+ FaSA== X-Gm-Message-State: APjAAAWHFCLSlBN+U7WkugAjJsLhHIJaZQSZDJ+zZyXED7uuwx3KiIT+ aaWrOr+IVZs2xizYq0a7jCzYZA== X-Received: by 2002:a5d:6249:: with SMTP id m9mr611030wrv.255.1557136703654; Mon, 06 May 2019 02:58:23 -0700 (PDT) Received: from boomer.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id c10sm23409791wrd.69.2019.05.06.02.58.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:58:23 -0700 (PDT) From: Jerome Brunet To: Mark Brown , Liam Girdwood Cc: Jerome Brunet , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patchwork-bot+notify@kernel.org Subject: [PATCH v2 1/4] ASoC: hdmi-codec: remove function name debug traces Date: Mon, 6 May 2019 11:58:12 +0200 Message-Id: <20190506095815.24578-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095815.24578-1-jbrunet@baylibre.com> References: <20190506095815.24578-1-jbrunet@baylibre.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the debug traces only showing the function name on entry. The same can be obtained using ftrace. Signed-off-by: Jerome Brunet --- sound/soc/codecs/hdmi-codec.c | 12 ------------ 1 file changed, 12 deletions(-) -- 2.20.1 diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 39caf19abb0b..eb31d7eddcbf 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -416,8 +416,6 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); int ret = 0; - dev_dbg(dai->dev, "%s()\n", __func__); - ret = hdmi_codec_new_stream(substream, dai); if (ret) return ret; @@ -457,8 +455,6 @@ static void hdmi_codec_shutdown(struct snd_pcm_substream *substream, { struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); - dev_dbg(dai->dev, "%s()\n", __func__); - WARN_ON(hcp->current_stream != substream); hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; @@ -527,8 +523,6 @@ static int hdmi_codec_set_fmt(struct snd_soc_dai *dai, struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); struct hdmi_codec_daifmt cf = { 0 }; - dev_dbg(dai->dev, "%s()\n", __func__); - if (dai->id == DAI_ID_SPDIF) return 0; @@ -597,8 +591,6 @@ static int hdmi_codec_digital_mute(struct snd_soc_dai *dai, int mute) { struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); - dev_dbg(dai->dev, "%s()\n", __func__); - if (hcp->hcd.ops->digital_mute) return hcp->hcd.ops->digital_mute(dai->dev->parent, hcp->hcd.data, mute); @@ -656,8 +648,6 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, }; int ret; - dev_dbg(dai->dev, "%s()\n", __func__); - ret = snd_pcm_add_chmap_ctls(rtd->pcm, SNDRV_PCM_STREAM_PLAYBACK, NULL, drv->playback.channels_max, 0, &hcp->chmap_info); @@ -754,8 +744,6 @@ static int hdmi_codec_probe(struct platform_device *pdev) int dai_count, i = 0; int ret; - dev_dbg(dev, "%s()\n", __func__); - if (!hcd) { dev_err(dev, "%s: No platform data\n", __func__); return -EINVAL; From patchwork Mon May 6 09:58:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 163392 Delivered-To: patch@linaro.org Received: by 2002:a92:3d95:0:0:0:0:0 with SMTP id k21csp1650234ilf; Mon, 6 May 2019 02:58:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxfVpAuUA5MMZ6BwBvtlEdS8Mohr2/au7oo7LnbnHxgKSIDY1zYhwW7jgypncicZd+6VPtm X-Received: by 2002:a63:534f:: with SMTP id t15mr31346558pgl.445.1557136715129; Mon, 06 May 2019 02:58:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557136715; cv=none; d=google.com; s=arc-20160816; b=OkIVEi4/TTIdVVNpc+F34Io6DKAM6t5pOFAV9/2Wr+/EFwqaxD3PPeguFJHYj5TUlj mIazA9kJOUFbP/Js2F/qJFA1eDe2DdMvK5a+XYT/nsHYGHxfrs25VHJ56ogSVWXU3Zoy NNtSHjF9VbN8gBs72efm0T9uJMV17ZqpSrmml4m6C9bw7OA35I4f7IuGQvn1TlBPZFou ao+369EGjSO8SpeCkNNnFnEB8tqNbml9jeHGIkTMdvLiXLJuxUCBv3jyzz6PnVtG46T4 d9AYG3KtUfcg/0awBkzX7egmt8Ec6oi0htMI0/bGvRTPOn7FskIL0x8P66TunQSyv2Jz MDGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jFAZLM2HXuFCxb/qpIKx/Zvd6z+9jBXknwydcf65Gow=; b=BlOCCSJC2/JwG5OV4lSzNE16NZoggr2iKhq5idomFcKak9RAOTL/zfn1ST526PJb6q wdFgWw42rMl3QAtYndSbHZpUHzOSSBiNH1rk5VgqChpIwhkfl57HZo5MH8/hW9aDWYzW dIOyAT1ai0S1AiipMGPvw3T8ZkilRxuzUjzYnTg6T46+q+Jep6juFaxCwhiRMMzQwqUG HotTCNV1C9yPw8zQ2+sYbzTlSZgrciBYvP2D0eVguapsG82q5xU1BtUyUTfULwDtwTZO +Admwo9zvPmgNht8aHzmh0GGdr16WxzWDYFznY3At/q9lxJzXnOsPk4Z6eaLGnoGJNgR 5tvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=WouC9aTp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u12si14353000pls.150.2019.05.06.02.58.34; Mon, 06 May 2019 02:58:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=WouC9aTp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726420AbfEFJ63 (ORCPT + 30 others); Mon, 6 May 2019 05:58:29 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:56050 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726304AbfEFJ61 (ORCPT ); Mon, 6 May 2019 05:58:27 -0400 Received: by mail-wm1-f68.google.com with SMTP id y2so14658078wmi.5 for ; Mon, 06 May 2019 02:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jFAZLM2HXuFCxb/qpIKx/Zvd6z+9jBXknwydcf65Gow=; b=WouC9aTpP+JbWnMYvxrFG/C6chBDo+e5JZjiNsYqbm1PNvq2E6DI/tdFgRaefTjk7i dNjc79J6JQivuiOzumg4tKN6nqc9pthH/ZXoBubgM1z73EO/P6ZuoANyqjt8AFGtzrox Vql+EhiR33zOisnT0IV4X/4e/92L5bH6IDmnx+zE3q6H5MoMovyn0VzUkQNR0OE90imA eT4RaWKVBYJJ80/h7P2uUdpWyPEvjwJ/iuM/hwMegTQpfDHfRPtK0uzeM1OoO9aVsaLZ trtYy11H5oiseOjLJjgK+D80szm9pmKtydFxdC4+PqhUTs3pbDpBur1EV1ejfQ49DpP6 S0BA== 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:mime-version:content-transfer-encoding; bh=jFAZLM2HXuFCxb/qpIKx/Zvd6z+9jBXknwydcf65Gow=; b=YTv8YQ40b3p0JEJct6fCniCyiMaUxsRBTZHnGCfGHxFQddfSg1dVrQkb7+uButhiTu bVkaqjggR/dckIQRW32+JG/2MdFtKPsCySIBpPJV16vmRbPWR0a6t3nq78iVcol1wKnd HhxM5ee2/FJvf+/qndfPp/Zvrqh8VnuyMXcbYOtCqTheRkIM0m+NcFdj9RtLODmjYB5n Kf3iyKdLe8lvjTMTaEO2sv8Ynlfs91Xy5TbATJXzk27z5cQFhN4QwrVcC1+3br7F56eO 69dCfA7f51S46TWS7GIMNLnT5OeyJDiu8rrH8JTG5/iEl/IWfXThGn2oC7w00pLHqEQ/ 1qog== X-Gm-Message-State: APjAAAUzpGihjG/ad/VV5YNik82wYAwele9RRO2CxAmBs/C37R335Evb 4LIe3gtCBjnWZ/wn+UKQS0z+rIKikh0= X-Received: by 2002:a1c:67c1:: with SMTP id b184mr15691569wmc.12.1557136704663; Mon, 06 May 2019 02:58:24 -0700 (PDT) Received: from boomer.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id c10sm23409791wrd.69.2019.05.06.02.58.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:58:24 -0700 (PDT) From: Jerome Brunet To: Mark Brown , Liam Girdwood Cc: Jerome Brunet , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patchwork-bot+notify@kernel.org Subject: [PATCH v2 2/4] ASoC: hdmi-codec: remove reference to the current substream Date: Mon, 6 May 2019 11:58:13 +0200 Message-Id: <20190506095815.24578-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095815.24578-1-jbrunet@baylibre.com> References: <20190506095815.24578-1-jbrunet@baylibre.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the hdmi-codec is on a codec-to-codec link, the substream pointer it receives is completely made up by snd_soc_dai_link_event(). The pointer will be different between startup() and shutdown(). The hdmi-codec complains when this happens even if it is not really a problem. The current_substream pointer is not used for anything useful apart from getting the exclusive ownership of the device. Remove current_substream pointer and replace the exclusive locking mechanism with a simple variable and some atomic operations. Signed-off-by: Jerome Brunet --- sound/soc/codecs/hdmi-codec.c | 58 ++++++++++------------------------- 1 file changed, 16 insertions(+), 42 deletions(-) -- 2.20.1 diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index eb31d7eddcbf..4d32f93f6be6 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -280,11 +280,10 @@ struct hdmi_codec_priv { struct hdmi_codec_pdata hcd; struct snd_soc_dai_driver *daidrv; struct hdmi_codec_daifmt daifmt[2]; - struct mutex current_stream_lock; - struct snd_pcm_substream *current_stream; uint8_t eld[MAX_ELD_BYTES]; struct snd_pcm_chmap *chmap_info; unsigned int chmap_idx; + unsigned long busy; }; static const struct snd_soc_dapm_widget hdmi_widgets[] = { @@ -392,42 +391,22 @@ static int hdmi_codec_chmap_ctl_get(struct snd_kcontrol *kcontrol, return 0; } -static int hdmi_codec_new_stream(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); - int ret = 0; - - mutex_lock(&hcp->current_stream_lock); - if (!hcp->current_stream) { - hcp->current_stream = substream; - } else if (hcp->current_stream != substream) { - dev_err(dai->dev, "Only one simultaneous stream supported!\n"); - ret = -EINVAL; - } - mutex_unlock(&hcp->current_stream_lock); - - return ret; -} - static int hdmi_codec_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); int ret = 0; - ret = hdmi_codec_new_stream(substream, dai); - if (ret) - return ret; + ret = test_and_set_bit(0, &hcp->busy); + if (ret) { + dev_err(dai->dev, "Only one simultaneous stream supported!\n"); + return -EINVAL; + } if (hcp->hcd.ops->audio_startup) { ret = hcp->hcd.ops->audio_startup(dai->dev->parent, hcp->hcd.data); - if (ret) { - mutex_lock(&hcp->current_stream_lock); - hcp->current_stream = NULL; - mutex_unlock(&hcp->current_stream_lock); - return ret; - } + if (ret) + goto err; } if (hcp->hcd.ops->get_eld) { @@ -437,17 +416,18 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, if (!ret) { ret = snd_pcm_hw_constraint_eld(substream->runtime, hcp->eld); - if (ret) { - mutex_lock(&hcp->current_stream_lock); - hcp->current_stream = NULL; - mutex_unlock(&hcp->current_stream_lock); - return ret; - } + if (ret) + goto err; } /* Select chmap supported */ hdmi_codec_eld_chmap(hcp); } return 0; + +err: + /* Release the exclusive lock on error */ + clear_bit(0, &hcp->busy); + return ret; } static void hdmi_codec_shutdown(struct snd_pcm_substream *substream, @@ -455,14 +435,10 @@ static void hdmi_codec_shutdown(struct snd_pcm_substream *substream, { struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); - WARN_ON(hcp->current_stream != substream); - hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; hcp->hcd.ops->audio_shutdown(dai->dev->parent, hcp->hcd.data); - mutex_lock(&hcp->current_stream_lock); - hcp->current_stream = NULL; - mutex_unlock(&hcp->current_stream_lock); + clear_bit(0, &hcp->busy); } static int hdmi_codec_hw_params(struct snd_pcm_substream *substream, @@ -761,8 +737,6 @@ static int hdmi_codec_probe(struct platform_device *pdev) return -ENOMEM; hcp->hcd = *hcd; - mutex_init(&hcp->current_stream_lock); - hcp->daidrv = devm_kcalloc(dev, dai_count, sizeof(*hcp->daidrv), GFP_KERNEL); if (!hcp->daidrv) From patchwork Mon May 6 09:58:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 163391 Delivered-To: patch@linaro.org Received: by 2002:a92:3d95:0:0:0:0:0 with SMTP id k21csp1650199ilf; Mon, 6 May 2019 02:58:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxvYhY+aqo6CaegRJY5rfZtg5w8//Xl17Icyfaq/xYvJfoTNCOX9yHovNxZZwdEf/8dVsOQ X-Received: by 2002:a17:902:e188:: with SMTP id cd8mr9170807plb.110.1557136710929; Mon, 06 May 2019 02:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557136710; cv=none; d=google.com; s=arc-20160816; b=Le3YP9AZsOKyw2S1qrG+DubJGdadr8GNdAMO9mh6xRju14b+61wMBatXRkGemVsJbx wU3FMebo/A03Ag+WzGJLv6u5BavL2iko5bi+d3S19IU8y8hkFB7iBSLdnpIY26R1ER8w QBWK/NcwMIAvyEwP8GJMsYYHl2u1dAvzhtEstYMbr3gHvUQOnFeBUsNI524xs+C+WPHL 2IZ9+wW0nUsLHvpaMmw8kxL8MaxgSJvgSvc3rRX7kZvk4kvpVJAvSg2ufNtcN2kTEsj6 MTnwq4KS8tAVTDY3piRNQyjbTn2YXrQU9wiI8uKE83ARyWOEffFuWv5h7WYmlKmbAiPf IBOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X7AcpWA9A83L4FypCc369GCLs1Ntp7uwJwm/XxipXaE=; b=VwLBi3O6ypAQQbw0+uTfZbXm2+QljppRJKhxJjFuk8vLC8wcnmDS0uTmTa/zrCaeyG xHJNvvSgGLnT99xwx5i1jL+BFZIYWZCdkEmUmf54sx9OihJCEKMMiFOAuLzMHSGTWfAS n/AkK/Ps7GChmdZW/INYglXTOqYA++6OvI/TasYGSax2ldh9GP/0PTdODqlTcwPFdoz8 Z8JCU3FxeF8tpWqsrgkWxhxN2+/d5DVzsykENfbhWGMVTt5L7xH3P/PE52Pc/ePYykhY cGUNhA7a3T3Uwv8hBydN5dr5pggXzz6TStm3TDlIDtbq+rLDBHg0usGngEOxuehOWbsL /PvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=tkNli+26; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v7si11185757pgb.40.2019.05.06.02.58.30; Mon, 06 May 2019 02:58:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=tkNli+26; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726466AbfEFJ63 (ORCPT + 30 others); Mon, 6 May 2019 05:58:29 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33990 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725856AbfEFJ61 (ORCPT ); Mon, 6 May 2019 05:58:27 -0400 Received: by mail-wr1-f68.google.com with SMTP id f7so6113701wrq.1 for ; Mon, 06 May 2019 02:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X7AcpWA9A83L4FypCc369GCLs1Ntp7uwJwm/XxipXaE=; b=tkNli+26My6vrczGDwdluDE7HLnExdDaIwWUJCnpa4VluVUwGnbyIpFbDmCLJjxBM4 giBX2hEpBS3HS9XssUh6r+omnD+ojlJH+sW9cDeFDBr9R1lMWmT+Ek7g7bXGF/c6+LUh PooGogBA4eNNtnk+NuvoYHCGynN1FSgU9zN6/De8aBhVaelHmlKea5y0z2sz4sEJNdKr OjO+1w8F9h2cYU8G9NIXEWjb6vmh/b4yNfxCY46j9zJvBKs3QVi74I258ifIBY6rRWaG tLaHbEzyk8GBA9xwbWFLMjigRnrLEzB+y19uCtIHiGvz8VqaqYmTg9KQtCqRyrmbc+7X S0Zw== 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:mime-version:content-transfer-encoding; bh=X7AcpWA9A83L4FypCc369GCLs1Ntp7uwJwm/XxipXaE=; b=tMUVxnV6tBzWS9yu0W5cXwnYaNaehwcZZS1gduJ4MXptNudFCTaPcQ9xPV+/Rd1jnz Sj6z7D0PFPqjI4BAAI/OuPmNqEc/VxKtWURtewaAtxY4Q+lAdFfm43BKPfz9XHYFPknY kf0WQPDy/2GKzZJD02u/Zxje7AkeIvR3ebOmEigssZK9h7yeeN5Sp/5brflG/kxDTpoo oticZXU59UIKrJCfQAAxyDGuTby5R3MSkcsAEwMwd52F2yiVJ5vl94zwKxvcIU4jaqdN 41TWibGFX/03q8qjaQNNKgzRzdL6N2xxziOXV8gb6lCkT343IlKOvev5E+cw6d/7vk7N UobQ== X-Gm-Message-State: APjAAAWgnwMloLmDfbP0D2xg9lYCZnitHqzOyo+jjhlCfRz+1KobJD07 P2Mcjtu84DH9fSkv25qJjx+wcA== X-Received: by 2002:adf:ee88:: with SMTP id b8mr6800608wro.291.1557136705814; Mon, 06 May 2019 02:58:25 -0700 (PDT) Received: from boomer.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id c10sm23409791wrd.69.2019.05.06.02.58.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:58:25 -0700 (PDT) From: Jerome Brunet To: Mark Brown , Liam Girdwood Cc: Jerome Brunet , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patchwork-bot+notify@kernel.org Subject: [PATCH v2 3/4] ASoC: hdmi-codec: remove reference to the dai drivers in the private data Date: Mon, 6 May 2019 11:58:14 +0200 Message-Id: <20190506095815.24578-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095815.24578-1-jbrunet@baylibre.com> References: <20190506095815.24578-1-jbrunet@baylibre.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Keeping the a pointer to the dai drivers is not necessary. It is not used by the hdmi_codec after the probe. Even if it was used, the 'struct snd_soc_dai_driver' can accessed through the 'struct snd_soc_dai' so keeping the pointer in the private data structure is not useful. Signed-off-by: Jerome Brunet --- sound/soc/codecs/hdmi-codec.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 4d32f93f6be6..9408e6bc4d3e 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -278,7 +278,6 @@ static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = { struct hdmi_codec_priv { struct hdmi_codec_pdata hcd; - struct snd_soc_dai_driver *daidrv; struct hdmi_codec_daifmt daifmt[2]; uint8_t eld[MAX_ELD_BYTES]; struct snd_pcm_chmap *chmap_info; @@ -715,6 +714,7 @@ static const struct snd_soc_component_driver hdmi_driver = { static int hdmi_codec_probe(struct platform_device *pdev) { struct hdmi_codec_pdata *hcd = pdev->dev.platform_data; + struct snd_soc_dai_driver *daidrv; struct device *dev = &pdev->dev; struct hdmi_codec_priv *hcp; int dai_count, i = 0; @@ -737,27 +737,25 @@ static int hdmi_codec_probe(struct platform_device *pdev) return -ENOMEM; hcp->hcd = *hcd; - hcp->daidrv = devm_kcalloc(dev, dai_count, sizeof(*hcp->daidrv), - GFP_KERNEL); - if (!hcp->daidrv) + daidrv = devm_kcalloc(dev, dai_count, sizeof(*daidrv), GFP_KERNEL); + if (!daidrv) return -ENOMEM; if (hcd->i2s) { - hcp->daidrv[i] = hdmi_i2s_dai; - hcp->daidrv[i].playback.channels_max = - hcd->max_i2s_channels; + daidrv[i] = hdmi_i2s_dai; + daidrv[i].playback.channels_max = hcd->max_i2s_channels; i++; } if (hcd->spdif) { - hcp->daidrv[i] = hdmi_spdif_dai; + daidrv[i] = hdmi_spdif_dai; hcp->daifmt[DAI_ID_SPDIF].fmt = HDMI_SPDIF; } dev_set_drvdata(dev, hcp); - ret = devm_snd_soc_register_component(dev, &hdmi_driver, hcp->daidrv, - dai_count); + ret = devm_snd_soc_register_component(dev, &hdmi_driver, daidrv, + dai_count); if (ret) { dev_err(dev, "%s: snd_soc_register_component() failed (%d)\n", __func__, ret); From patchwork Mon May 6 09:58:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 163393 Delivered-To: patch@linaro.org Received: by 2002:a92:3d95:0:0:0:0:0 with SMTP id k21csp1650265ilf; Mon, 6 May 2019 02:58:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyQpeaw0TLe1ZQaxoHnrZ3RxdgiMmBisQwfza+wf10+egAF+NRCejKkAz5q7POdGIn9Gij7 X-Received: by 2002:a62:579b:: with SMTP id i27mr13125496pfj.205.1557136717861; Mon, 06 May 2019 02:58:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557136717; cv=none; d=google.com; s=arc-20160816; b=sxjbIUrqu+WlfSj2sHX311irv1EDz6vyFEo0v73+ujzov/7YCf2gUifX/XvvQB5wXj Ly4ycAQqsRtVqWZX64bJ/jh9IVoJp2VTy/1qmrBwJIwGCGpm070Lz+WTge7mQEZErivh pXjRDvyxI7dC6Md0Jsh8CwlIjkBCPUb2EBFMT37Y58uJ0tHKrbfQmUHZ09VhqeyNj805 eJR02QgD0TRdKUNzDmQUMq8uWm+aqNB7mSJtA5ltlMtoJIx5USYntTJO94Y1IdxRQJfJ n0uBIigZ/lYHmhiWjpSqZ2BII+aHLCy9J4w4BBldgBiRsT+m/5pxUhV2FiCKiPmRk2CT AO5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=spyvVZOA092Rq/pDhbTlA8tcvHt4DyPzwJ7M6MsQeGA=; b=Znn4zH2hVbeLYxD0OQ3ZlAIckHsp2qM+/ZsH57GM+hLhyQ9eVJ4Z9LFlYjGiA0WdCd FYO7YNpHk4DcZnTMGCxqnJoM06wL15DDPTLoLMVUOj421YYdvFPmlcxKKY1Vp8MrnLiZ /19qimTACocj8t8dedsENKS+rWkw7zgQ/AD21s18He3e+OKArCTJyIMK8ot00BUskbpp MPLLQ8nHxWQXz6W/nJTs9Br5xy7Ajp3wsOUM9PBD7bwUf4Cv8EeXh9DsXC5t2wLywb7i eAybwz5cJ3imTSh6AepAGwLdXiKK5Ot97FCNEceUB5aACrhD+X2wsrsBDzlSrar+xcJy wc0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=tcCdgTG8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u12si14353000pls.150.2019.05.06.02.58.37; Mon, 06 May 2019 02:58:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=tcCdgTG8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726501AbfEFJ6g (ORCPT + 30 others); Mon, 6 May 2019 05:58:36 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42567 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726352AbfEFJ63 (ORCPT ); Mon, 6 May 2019 05:58:29 -0400 Received: by mail-wr1-f66.google.com with SMTP id l2so16454394wrb.9 for ; Mon, 06 May 2019 02:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=spyvVZOA092Rq/pDhbTlA8tcvHt4DyPzwJ7M6MsQeGA=; b=tcCdgTG8H8MAKQGHBtyfaqhZgC9xPbMemqlo38nW50o2fdg9QUHXNAT05F4uz1pgJc g27KbxkrZLb3kgtKhQgpVmDkVX6BEU/+azucdZWPCLyIqEu8rt7mTwuKWkekCiUD0ED/ P/RJu8RgYwvRkf2APWHfhpQOGR7yjvjvY3DTseJwtmVY96NxWYu22fLGqSWGTQcY3MeW Gd+KQkz69EtpMjAk9S69OuaY5tVbutsWwasUcqwjWM04T12h4yasr9m/1FVxUZZqJn+1 MKzAqrgvTZpvR0csyALcM4iwqJ1spJwi1ENeVtpWdrFy6QLquyNyi1EsnxIFXyRB1ImH sdsQ== 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:mime-version:content-transfer-encoding; bh=spyvVZOA092Rq/pDhbTlA8tcvHt4DyPzwJ7M6MsQeGA=; b=b9q4VGi2wYEGU09E7auIazMPaY9EwcIM51v9YPN8Je3mHaPeTJnmQ0xVe6x+qr0VIf VkkZJECQfO6LNNMTK4cr/GDWeCUrQNLIdiVDCnPNJxFG3cPAFaincNTwclmUeBbyrYoy YCMeJ6LwnA71nmJWZi06ho0b7bTj3mb0DDlL7EhfDdjFQjOk7qrRqTz0IthtpBzilmvF Q4vnynxUhD7Q3C7U0/YR4NPIqamiLBo/j9+HahXyh4wSw8vYvoJRgdzKem3hFdbsNbKq Y6m1E2ayJpqxXrawIA0Wdvvm8Zlw1TH4h+FfKyUC7D2H47Wy3LN10kP+HnT35P4vmEXe FTPg== X-Gm-Message-State: APjAAAWZfw8tz2mstMnITcLM3zjn3sc6qkZ0Vvto73Yirc3aOJv+/I9k AX5N930IbJc/Z1kYelruqTX3UQ== X-Received: by 2002:a5d:5108:: with SMTP id s8mr115083wrt.99.1557136706779; Mon, 06 May 2019 02:58:26 -0700 (PDT) Received: from boomer.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id c10sm23409791wrd.69.2019.05.06.02.58.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:58:26 -0700 (PDT) From: Jerome Brunet To: Mark Brown , Liam Girdwood Cc: Jerome Brunet , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, patchwork-bot+notify@kernel.org Subject: [PATCH v2 4/4] ASoC: hdmi-codec: remove ops dependency on the dai id Date: Mon, 6 May 2019 11:58:15 +0200 Message-Id: <20190506095815.24578-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095815.24578-1-jbrunet@baylibre.com> References: <20190506095815.24578-1-jbrunet@baylibre.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The dependency on the dai_id can be removed by setting different ops for the i2s and spdif dai and storing the dai format information in each dai structure. It simplies the code a bit. Signed-off-by: Jerome Brunet --- sound/soc/codecs/hdmi-codec.c | 100 +++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 33 deletions(-) -- 2.20.1 diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 9408e6bc4d3e..90a892766625 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -278,7 +278,6 @@ static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = { struct hdmi_codec_priv { struct hdmi_codec_pdata hcd; - struct hdmi_codec_daifmt daifmt[2]; uint8_t eld[MAX_ELD_BYTES]; struct snd_pcm_chmap *chmap_info; unsigned int chmap_idx; @@ -445,6 +444,7 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); + struct hdmi_codec_daifmt *cf = dai->playback_dma_data; struct hdmi_codec_params hp = { .iec = { .status = { 0 }, @@ -489,28 +489,27 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream, hp.channels = params_channels(params); return hcp->hcd.ops->hw_params(dai->dev->parent, hcp->hcd.data, - &hcp->daifmt[dai->id], &hp); + cf, &hp); } -static int hdmi_codec_set_fmt(struct snd_soc_dai *dai, - unsigned int fmt) +static int hdmi_codec_i2s_set_fmt(struct snd_soc_dai *dai, + unsigned int fmt) { - struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); - struct hdmi_codec_daifmt cf = { 0 }; + struct hdmi_codec_daifmt *cf = dai->playback_dma_data; - if (dai->id == DAI_ID_SPDIF) - return 0; + /* Reset daifmt */ + memset(cf, 0, sizeof(*cf)); switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: - cf.bit_clk_master = 1; - cf.frame_clk_master = 1; + cf->bit_clk_master = 1; + cf->frame_clk_master = 1; break; case SND_SOC_DAIFMT_CBS_CFM: - cf.frame_clk_master = 1; + cf->frame_clk_master = 1; break; case SND_SOC_DAIFMT_CBM_CFS: - cf.bit_clk_master = 1; + cf->bit_clk_master = 1; break; case SND_SOC_DAIFMT_CBS_CFS: break; @@ -522,43 +521,41 @@ static int hdmi_codec_set_fmt(struct snd_soc_dai *dai, case SND_SOC_DAIFMT_NB_NF: break; case SND_SOC_DAIFMT_NB_IF: - cf.frame_clk_inv = 1; + cf->frame_clk_inv = 1; break; case SND_SOC_DAIFMT_IB_NF: - cf.bit_clk_inv = 1; + cf->bit_clk_inv = 1; break; case SND_SOC_DAIFMT_IB_IF: - cf.frame_clk_inv = 1; - cf.bit_clk_inv = 1; + cf->frame_clk_inv = 1; + cf->bit_clk_inv = 1; break; } switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: - cf.fmt = HDMI_I2S; + cf->fmt = HDMI_I2S; break; case SND_SOC_DAIFMT_DSP_A: - cf.fmt = HDMI_DSP_A; + cf->fmt = HDMI_DSP_A; break; case SND_SOC_DAIFMT_DSP_B: - cf.fmt = HDMI_DSP_B; + cf->fmt = HDMI_DSP_B; break; case SND_SOC_DAIFMT_RIGHT_J: - cf.fmt = HDMI_RIGHT_J; + cf->fmt = HDMI_RIGHT_J; break; case SND_SOC_DAIFMT_LEFT_J: - cf.fmt = HDMI_LEFT_J; + cf->fmt = HDMI_LEFT_J; break; case SND_SOC_DAIFMT_AC97: - cf.fmt = HDMI_AC97; + cf->fmt = HDMI_AC97; break; default: dev_err(dai->dev, "Invalid DAI interface format\n"); return -EINVAL; } - hcp->daifmt[dai->id] = cf; - return 0; } @@ -573,14 +570,20 @@ static int hdmi_codec_digital_mute(struct snd_soc_dai *dai, int mute) return 0; } -static const struct snd_soc_dai_ops hdmi_dai_ops = { +static const struct snd_soc_dai_ops hdmi_codec_i2s_dai_ops = { .startup = hdmi_codec_startup, .shutdown = hdmi_codec_shutdown, .hw_params = hdmi_codec_hw_params, - .set_fmt = hdmi_codec_set_fmt, + .set_fmt = hdmi_codec_i2s_set_fmt, .digital_mute = hdmi_codec_digital_mute, }; +static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = { + .startup = hdmi_codec_startup, + .shutdown = hdmi_codec_shutdown, + .hw_params = hdmi_codec_hw_params, + .digital_mute = hdmi_codec_digital_mute, +}; #define HDMI_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\ @@ -648,20 +651,52 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, static int hdmi_dai_probe(struct snd_soc_dai *dai) { struct snd_soc_dapm_context *dapm; + struct hdmi_codec_daifmt *daifmt; struct snd_soc_dapm_route route = { .sink = "TX", .source = dai->driver->playback.stream_name, }; + int ret; dapm = snd_soc_component_get_dapm(dai->component); + ret = snd_soc_dapm_add_routes(dapm, &route, 1); + if (ret) + return ret; + + daifmt = kzalloc(sizeof(*daifmt), GFP_KERNEL); + if (!daifmt) + return -ENOMEM; - return snd_soc_dapm_add_routes(dapm, &route, 1); + dai->playback_dma_data = daifmt; + return 0; +} + +static int hdmi_dai_spdif_probe(struct snd_soc_dai *dai) +{ + struct hdmi_codec_daifmt *cf = dai->playback_dma_data; + int ret; + + ret = hdmi_dai_probe(dai); + if (ret) + return ret; + + cf = dai->playback_dma_data; + cf->fmt = HDMI_SPDIF; + + return 0; +} + +static int hdmi_codec_dai_remove(struct snd_soc_dai *dai) +{ + kfree(dai->playback_dma_data); + return 0; } static const struct snd_soc_dai_driver hdmi_i2s_dai = { .name = "i2s-hifi", .id = DAI_ID_I2S, .probe = hdmi_dai_probe, + .remove = hdmi_codec_dai_remove, .playback = { .stream_name = "I2S Playback", .channels_min = 2, @@ -670,14 +705,15 @@ static const struct snd_soc_dai_driver hdmi_i2s_dai = { .formats = I2S_FORMATS, .sig_bits = 24, }, - .ops = &hdmi_dai_ops, + .ops = &hdmi_codec_i2s_dai_ops, .pcm_new = hdmi_codec_pcm_new, }; static const struct snd_soc_dai_driver hdmi_spdif_dai = { .name = "spdif-hifi", .id = DAI_ID_SPDIF, - .probe = hdmi_dai_probe, + .probe = hdmi_dai_spdif_probe, + .remove = hdmi_codec_dai_remove, .playback = { .stream_name = "SPDIF Playback", .channels_min = 2, @@ -685,7 +721,7 @@ static const struct snd_soc_dai_driver hdmi_spdif_dai = { .rates = HDMI_RATES, .formats = SPDIF_FORMATS, }, - .ops = &hdmi_dai_ops, + .ops = &hdmi_codec_spdif_dai_ops, .pcm_new = hdmi_codec_pcm_new, }; @@ -747,10 +783,8 @@ static int hdmi_codec_probe(struct platform_device *pdev) i++; } - if (hcd->spdif) { + if (hcd->spdif) daidrv[i] = hdmi_spdif_dai; - hcp->daifmt[DAI_ID_SPDIF].fmt = HDMI_SPDIF; - } dev_set_drvdata(dev, hcp);