From patchwork Mon Apr 29 13:29:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 163024 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp1887734ill; Mon, 29 Apr 2019 06:29:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqzujPjW1CWtQ2VvLCmo6Ul/iCDgR9m/66UdtDo1iguKrMWqOdMvI/XS4VOCFdOHuD3F4JYA X-Received: by 2002:a65:6655:: with SMTP id z21mr58321618pgv.33.1556544597737; Mon, 29 Apr 2019 06:29:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556544597; cv=none; d=google.com; s=arc-20160816; b=bSjQWbi30sIdot+LbpO+Jb6FSDQRNLs1mR+KMEi1lhKZfN/M6mKLL3VWjlWhUT3qjy 8+dq5wSPyL7WH7GIJBvABZ4o8uQb5mz+ULBAsKEYrVlkCjbdVXCG7IfxR6vQHIZu53ly CxtZeEOEnA0ZujA57ubMCy87pPnc4nckX7/fVdOk74juvZNIcVvDo/eQjvc61+SCF88e GSxoiYebGQ+gQERYSdVDltk9zYgMYDhPyhcO20oev7vmEfxzReuTAcPb0muZGZeVW0uP +50ogyVEWrhf8LF48yANpvPFw4jL59r8ex9dhUc+FwS/8ucqNJJtuqtFWowVGcQ1AhvL sjtQ== 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=whsOXQ8xRakI5AVYAzepVuB15C/D0yrTQsABLkaS6Vw=; b=pfFykhI3WbJjMvDB7WwGGaav25aiKM+zLmgPCdYXxet2YM9eGlqCrE7otD1trIqkXe sU1gVrYu79qHO6XslxwVzM21yDDEr2xqOheZS+8+Ngq05s35gfKJNPhUx++qXEyLBTbz 32H4Yb2vLvS+HUe6Iajt12ZyGNmdrmBav5WAOSumoIV7K1eZYXSKhwhHBkThpBvUTd47 Fo11MBFlKDcp9r1inAUO4sHm5doNVHjiSuicVj1QG440jYvHXTOmSt4maXNSO155YOs4 cd4e+JLrfytDvAzsnagnnZC5fw4F3FC+45c+Xugo7Fd9Y9KFa5yEpTjla0/AVaieqMVe pP/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=J2dTv1NP; 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 cl5si7420539plb.397.2019.04.29.06.29.57; Mon, 29 Apr 2019 06:29:57 -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=J2dTv1NP; 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 S1728280AbfD2N34 (ORCPT + 30 others); Mon, 29 Apr 2019 09:29:56 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46930 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728246AbfD2N3x (ORCPT ); Mon, 29 Apr 2019 09:29:53 -0400 Received: by mail-wr1-f68.google.com with SMTP id t17so16009283wrw.13 for ; Mon, 29 Apr 2019 06:29:52 -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=whsOXQ8xRakI5AVYAzepVuB15C/D0yrTQsABLkaS6Vw=; b=J2dTv1NPn4J99TrrljZ2hOdA1bv1ifuVO+cH2SVjLUxRsCwvDn6BHWRe13ydolX9HU f0TgeitA6xsof7AZ1BTeJMhJx9kNVCtreRIIz9tilr7F8ppdQBBxnamrpVfxs+7s0EuC /JVT4wZ1PMsPZY5/LjXMc70KWL4sthpL7sEtgbb7ZuUzPpYMMhz4nifFsD75k0rW8ryA spcy4SlO6AluDcIowl1fcf1VPnzD2N57NI7qTRcgkQAlS9idnCiCIUExwUaYbgeV7gih tm7D8w2q0cvdL0hYkGcQiVK21c5VDYXHMhWi8jpwQFBdbCzSs5At+eD45xDtXv+WytzX tf+A== 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=whsOXQ8xRakI5AVYAzepVuB15C/D0yrTQsABLkaS6Vw=; b=jSjqbXfxdamEX83PCunFV/AEM0aNjTJiZFw9tNFlxZoYANPdVM5AUXplXseiWX2PfG Khb/CI2E3N0tvCOpKiY5/aF19ML4KGl7MzdCBg4HQIMpL1H3gV8wMyVNcG3ExiKNeq37 iEw2gLl9LOj0rPC+/ZFj2bZVhz/rkrTBGOgP0rMpqOJsb3pMWbdBVIMTqyepqg+2UlYd naEaekFcjy2BA3UUUOne3cl9ELRUebqya5Cx1owzBWKk82HLhZ4m6MlEdaJVTDHpyqEE sVvuYJgwsaJVsUmJOp4N0kkksiMEHtSdwYk8Rf+cXDV8R+qQJFe/ZXQJbHOs6O6lxmvj tDLw== X-Gm-Message-State: APjAAAUhPMvHZLSN6ktGJHGmgJm4cSU4WeR6Pu7+rX+mmqF0NQcpS8PG 5JGif+nzW+COs/cTgXdxUD91ZiYMue4= X-Received: by 2002:adf:f845:: with SMTP id d5mr2185657wrq.107.1556544591717; Mon, 29 Apr 2019 06:29:51 -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 s17sm2857593wra.94.2019.04.29.06.29.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Apr 2019 06:29:51 -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 3/6] ASoC: hdmi-codec: stream is already locked in hw_params Date: Mon, 29 Apr 2019 15:29:40 +0200 Message-Id: <20190429132943.16269-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429132943.16269-1-jbrunet@baylibre.com> References: <20190429132943.16269-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 startup() should have run before hw_params() is called, so the current_substream pointer should already be properly set. There is no reason to call hdmi_codec_new_stream() again in the hw_params() callback Signed-off-by: Jerome Brunet --- sound/soc/codecs/hdmi-codec.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.20.1 diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 4bd598253c62..780f2008b271 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -495,10 +495,6 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream, return ret; } - ret = hdmi_codec_new_stream(substream, dai); - if (ret) - return ret; - hdmi_audio_infoframe_init(&hp.cea); hp.cea.channels = params_channels(params); hp.cea.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;