From patchwork Tue Dec 5 12:46:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120644 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5701817qgn; Tue, 5 Dec 2017 04:47:07 -0800 (PST) X-Google-Smtp-Source: AGs4zMYrdDVHoDSn+wKJ+a+RML2JGmvWNwVLqQdN7KvvUg/ljjSdptvH+f25+vNo4/7GJDzwcXnN X-Received: by 10.223.195.198 with SMTP id d6mr16158685wrg.100.1512478027477; Tue, 05 Dec 2017 04:47:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512478027; cv=none; d=google.com; s=arc-20160816; b=N1C3a1me8atXSafiBffXhG1+Vd09qRy+aNA9GCZR7X9j5sXBxP+OQ45Q5CIPQaMEta se7PwTaEfmBVKVrqIt7vIaxsi7U05n8ASJ+FsgKzIWzTo7Nyaiv7Zs24yg7oCC3HfxW7 KfOZ3v6EbDFUuDFk/klqkhTEGJJK/SSHrClu6ObjkWvcfHqj/5ZLKINTHu4AlHJ+tpJC qtcQfZ35KF5yQ7jWrBaSSzCB6nMK44z31iocd+CKPJtW5W2cEjs+5RBWRLLw7bHt1nox 9igu4H0TWIKzBeU+dsZbZD0j/7gqR4KpsmBaELvAGIfLhcu944swrmPO1nkEh+6KTSxv ND9A== 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:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=yFrJzpgM8ZC5Jhu7Mrctu7MEf2AzcSS9QJ7cTYS7mEA=; b=kdcKhHPIOBIW0sCtzqWi2+BSJ9fgvYe+XQqhMwECVTec1hfLbbkhYUJRZO59WHsLAa vATp6H1xaoGyqx4B1bRcrqTD2V8g8aWz6WFrFpb/sTGTmFtEeBCnRVO+SmY3axzPobpB V26s+z+lqYz6xU8K74IZROE5Wgro5ZcF/mMOWIOs486lO/v5oMJss4e8vPn0FrjESi0C y8+iyo/ZjprzIxyQP5C2LK6uaFE6jDQBsaOwALZGLvvSq/DVWAytt6B2Mdi61BHXCI1j Pw7M+0Svctjg78wIpksKZI9KAJzz7z5CCA7khdh4RaowtT6bCD3XVHMOso4dW627jz/D HLBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=ttiR+RqF; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id w29si43504wra.433.2017.12.05.04.47.07; Tue, 05 Dec 2017 04:47:07 -0800 (PST) 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=@sirena.org.uk header.s=20170815-heliosphere header.b=ttiR+RqF; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6A09C267741; Tue, 5 Dec 2017 13:47:06 +0100 (CET) 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 B4DFF2674EF; Tue, 5 Dec 2017 13:47:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 2D6012674F0 for ; Tue, 5 Dec 2017 13:46:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=9oWoC4QUB3a0DM4BkbvElLXil9hcJlgqcfteggjK8EA=; b=ttiR+RqFlOFc CBzBBJOT4Op85rmJ3r3cnhLoMGu3bIN75WxCxpG9va9YOkBj6fTkfg74au22YpXREP5I6iSm7+Gn/ JD3EAMo8un39IjrFJejh6uq3nab5jRhI0HAGNdVo5pEwOrVb2aRCezB9oA8BBX3WylbhUBsarAtW6 tWKq0=; Received: from 92.40.248.179.threembb.co.uk ([92.40.248.179] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eMCci-0001M9-AI; Tue, 05 Dec 2017 12:46:56 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 024DE44006B; Tue, 5 Dec 2017 12:46:52 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <874lsnkkl4.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20171205124653.024DE44006B@finisterre.ee.mobilebroadband> Date: Tue, 5 Dec 2017 12:46:52 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Lars-Peter Subject: [alsa-devel] Applied "ASoC: don't use rtd->codec on intel/skylake" to the asoc tree 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 The patch ASoC: don't use rtd->codec on intel/skylake has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 356a383bd978e58b5324284dc21210467968b4ff Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 5 Dec 2017 04:23:35 +0000 Subject: [PATCH] ASoC: don't use rtd->codec on intel/skylake rtd->codec will be removed soon. rtd->codec = rtd->codec_dai->codec, thus, we can use rtd->codec_dai->component instead of it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/intel/skylake/skl-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.15.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 4380e40c6af0..18138dc872d9 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -536,7 +536,7 @@ static int skl_link_hw_params(struct snd_pcm_substream *substream, snd_soc_dai_set_dma_data(dai, substream, (void *)link_dev); - link = snd_hdac_ext_bus_get_link(ebus, rtd->codec->component.name); + link = snd_hdac_ext_bus_get_link(ebus, codec_dai->component->name); if (!link) return -EINVAL; @@ -619,7 +619,7 @@ static int skl_link_hw_free(struct snd_pcm_substream *substream, link_dev->link_prepared = 0; - link = snd_hdac_ext_bus_get_link(ebus, rtd->codec->component.name); + link = snd_hdac_ext_bus_get_link(ebus, rtd->codec_dai->component->name); if (!link) return -EINVAL;