From patchwork Tue Dec 5 12:46: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: 120642 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5701244qgn; Tue, 5 Dec 2017 04:46:31 -0800 (PST) X-Google-Smtp-Source: AGs4zMb4G1fWYTiEq4Ny5c22IHPE8EkuB8LPudCXJIbiWFXlb/7mNzy9lN9CqEzxl2y4nEzriWyG X-Received: by 10.223.181.132 with SMTP id c4mr15193317wre.42.1512477991406; Tue, 05 Dec 2017 04:46:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512477991; cv=none; d=google.com; s=arc-20160816; b=P0NMjpsM0+TW9NrrsJiI5doAABuYWlKZMw4Saf+6G2fddTmdf1ehPGi8ggx0fDrDVX fVkh2x//jR0L5OMWPuJkQ75AZk0UQROD+KB3zeV5yaqCQKu0Zw63jeDOGUYcxC4EkVyW YXEncmRI8Bx7t5O1TnRu5rmSTkNDHBiDJZQ1WuIeZf08JVjS2xEhAWlic89EJZwllQ0D O+yrS4hGqib/MRYs8uVTg6nYNJ0oMsh0O0fXERasTbCgdkRNHUSbIH4q/mrFDhLAFNfA rIghDOZ3+Fwb1Rd1LGZEXjwjBGe3G30zVVp7f+WzdRo1WHMZMHAflO/lQVJi4VDnfJhk xH0A== 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=G393dY5OLlXUO4iQJNfyV37ym8+m/CbLIhG9W/MYVRk=; b=ik6nWwn4M8/TIg570ZssZDj2twCucDkQV3cN0bgQD7vh+GJm5VWsl559p8t9HUdBjQ YEklFDLDaGyJLb2xyvjL8XvxQBxTcgkHViGmhgYP4yJLhCc2+f/xTltD4Ouddlz8t2G5 2Eiq3LIFkaypChf2gOAr+WD3IN9itcJ2FHaB6VVPfhUEw8bthbjSMeGcGY7i9ivpaR6q uMxJ54RmRb53wo8jlMsOIcxrpLplB1PHQbM6R3JysjHwlQGvo16wMCifdUyH8FqCqD0M K5IZrUMIOSPSp+IvESTcmMj9NRWBKuK3fEtzgDmHN++leGALu776EiOv+zHhvBHId11T BDnA== 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=a8IpveZ/; 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 k82si227915wmf.103.2017.12.05.04.46.31; Tue, 05 Dec 2017 04:46:31 -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=a8IpveZ/; 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 35D072674E2; Tue, 5 Dec 2017 13:46:30 +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 2C0102674E4; Tue, 5 Dec 2017 13:46:27 +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 89B84266AE1 for ; Tue, 5 Dec 2017 13:46:19 +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=KAE0B2+mansyOpWeHwIAJU6cWsS1O0sfQkDdUXea2UE=; b=a8IpveZ/dftf O+oPNnmOTXQ3HDb/x16EBVN4072rwS5cgOELWyN0QO6POMOL11IyjeJbNJAm95wNmmnxbDGtSF3HG abH3Pnnn1D/b54CarvP6CTgdidZto8XZhjvbIMhcRv6K8qauBhjN68QMGWfIGwblxM+Wyc21JOQQy 6nO1g=; 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 1eMCc6-0001Lv-L0; Tue, 05 Dec 2017 12:46:19 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 8D29C44006B; Tue, 5 Dec 2017 12:46:17 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87zi6xu7y3.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20171205124617.8D29C44006B@finisterre.ee.mobilebroadband> Date: Tue, 5 Dec 2017 12:46:17 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: don't use rtd->codec on qcom/apq8016_sbc" 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 qcom/apq8016_sbc 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 96e1b9eef4e53a1fea2b889881ca293d153fe0d1 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 5 Dec 2017 04:24:13 +0000 Subject: [PATCH] ASoC: don't use rtd->codec on qcom/apq8016_sbc 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/qcom/apq8016_sbc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index 03851fedd1e2..704428735e3c 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -43,7 +43,7 @@ struct apq8016_sbc_data { static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_card *card = rtd->card; struct apq8016_sbc_data *pdata = snd_soc_card_get_drvdata(card); @@ -102,15 +102,15 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd) for (i = 0 ; i < dai_link->num_codecs; i++) { struct snd_soc_dai *dai = rtd->codec_dais[i]; - codec = dai->codec; + component = dai->component; /* Set default mclk for internal codec */ - rval = snd_soc_codec_set_sysclk(codec, 0, 0, DEFAULT_MCLK_RATE, + rval = snd_soc_component_set_sysclk(component, 0, 0, DEFAULT_MCLK_RATE, SND_SOC_CLOCK_IN); if (rval != 0 && rval != -ENOTSUPP) { dev_warn(card->dev, "Failed to set mclk: %d\n", rval); return rval; } - rval = snd_soc_codec_set_jack(codec, &pdata->jack, NULL); + rval = snd_soc_component_set_jack(component, &pdata->jack, NULL); if (rval != 0 && rval != -ENOTSUPP) { dev_warn(card->dev, "Failed to set jack: %d\n", rval); return rval;