From patchwork Tue Dec 5 12:47:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120645 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5702463qgn; Tue, 5 Dec 2017 04:47:49 -0800 (PST) X-Google-Smtp-Source: AGs4zMZMOZSdIXSSpilHAAFKhuP4yIMQmDxL/0N4r4iU2M7ccRgs2HkJPYiSppef+0U/Ld0QW/r6 X-Received: by 10.28.59.133 with SMTP id i127mr5314213wma.30.1512478069346; Tue, 05 Dec 2017 04:47:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512478069; cv=none; d=google.com; s=arc-20160816; b=fqK6tEqvuXXi2PcmOn3qhDApnrdJUv+OoJhSVPomMUWsHer0Ia6PArJMlVetQjiHdI NCstTwAbTtJo1viYazn3WC4pk115e6CCHxz4taTw+VotBJUIOvephczs94frI037GGTI RUpjeqsMmu65647jtI4blSATUqIbC/tYV8Ie60uSiq4wRLDYTNPGCSlH37ej3HbV/bRR UNXSdihLrnkKcgnKqXtN3FUx4XELFENWuJcMQfuDLK5jpER9Pe79lLjfat6K1q8tCLsN bI2PC5tD5r7ZcnXQf0bKCnEZakUxmGjU+W2J+t12qQviEsi7ZEHclQJrY/hJq2mUoPME X+VA== 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=FeYH0BUvlCPTCuZSN20BkOSUUDjbAKZjLnVjSD2PPmM=; b=TSQ3B1LIh4I74nG+1+hgWkUeSO1huc2G0OrQlpL+LnC+ZcN/GDW4TzNV8AEzU5ILWe 2motYxRkqsbFwMUOMVnaXIVgNJNiW1uoZYStER4zV6B3CKZRFop8f/U/0O/2U9HTnqAu fVF+UAsAjC/q4dvc00/LOcw/190ynTfcCn/fDcc9Nu2pyJBj7MVJ6BGFjMMcCiDaonx2 WXDIWSTRCSHptsmXvThU2LHLR6nWLQqCtIVr0G6Qd+AAaGpQuRP6j733Dh7d1ptmrCpL asa7m7BOCJOk3mRb8s+LNTrbFTdiSIQQzZtI3E2dPz7phTRK19mIyOcXAFmMHjdKfhXe 2LJQ== 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=qFJtJtel; 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 s66si221267wmb.228.2017.12.05.04.47.49; Tue, 05 Dec 2017 04:47:49 -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=qFJtJtel; 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 3020F26773E; Tue, 5 Dec 2017 13:47:38 +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 44D672674F0; Tue, 5 Dec 2017 13:47:37 +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=1.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, PRX_BODY_30, 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 B411426774D for ; Tue, 5 Dec 2017 13:47:20 +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=c/RpVx1BIoDQXgkZ7rqJMP+nU6cImHC9f4jtu29lVVg=; b=qFJtJteldMzC l2UrAg/nJpGoHHKRZoKroV1F73vZ6D7ZVcOurmWEsuNKQMb5QjXRkp7T6WfDMS1l4HaqlVIXOPRIy XHGTG7i1ibvvHPq3CEbaao+oW1bWNPCXGJVawtSW+ErdmGhBrSORC6aZCDbKBBGqFs5BFnWFPbNKJ ZoLiU=; 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 1eMCd6-0001MG-5R; Tue, 05 Dec 2017 12:47:20 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 7E6EA44006B; Tue, 5 Dec 2017 12:47:17 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <8760d3kklp.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20171205124717.7E6EA44006B@finisterre.ee.mobilebroadband> Date: Tue, 5 Dec 2017 12:47:17 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Lars-Peter Subject: [alsa-devel] Applied "ASoC: don't use rtd->codec on fsl-asoc-card" 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 fsl-asoc-card 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 845f80cb401c2ff6b9b8d75ebfc04b83b70268ef Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 5 Dec 2017 04:23:21 +0000 Subject: [PATCH] ASoC: don't use rtd->codec on fsl-asoc-card 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/fsl/fsl-asoc-card.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/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 1225e0399de8..989be518c4ed 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -442,8 +442,8 @@ static int fsl_asoc_card_late_probe(struct snd_soc_card *card) if (fsl_asoc_card_is_ac97(priv)) { #if IS_ENABLED(CONFIG_SND_AC97_CODEC) - struct snd_soc_codec *codec = rtd->codec; - struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = rtd->codec_dai->component; + struct snd_ac97 *ac97 = snd_soc_component_get_drvdata(component); /* * Use slots 3/4 for S/PDIF so SSI won't try to enable