From patchwork Wed Feb 21 12:18:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129051 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp557295ljc; Wed, 21 Feb 2018 04:19:04 -0800 (PST) X-Google-Smtp-Source: AH8x226QCyiJ6TTIv6WI96bvPuDqP4HNP1p49SljSRO2HvcKUVtu4AOIL1v2y6gVlRTRQkQrd+vj X-Received: by 10.223.178.26 with SMTP id u26mr2929188wra.63.1519215544105; Wed, 21 Feb 2018 04:19:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519215544; cv=none; d=google.com; s=arc-20160816; b=vbn2jaB8niE/Og0camXxuAo71I82LL8kzUiHxfnb6QGbSVs8dJSThvrAwx5FvgR08Q O+9x4DSbISYfA0Tx6oSYWahLlrKSH1ON3GlXIxBE6KJS9FVnR6Fanox76Lqo5qEosdJI 1oUQzcjY2iHFwWboK+EPeMBymJvAjnMZnK4ZGiUMWqZHvq9No+2S2+5sPU5CFyxRRNbd y8UemCgVZTsnu8BNKSz255O7K/VKtSC0dMnjIcaxeVJymVMCh+rybCmktZRSStrYsDNJ WWEXuM3EFoso3smR20iy3lSIZmVAcRiUe0ntiRM+7v+8XJisumgiXFssZDwcf1ROr/M3 7RwQ== 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=yR36YajlGmYrfVjL9NO1t/qSBBrdJx1kJdeE8uQ1JXs=; b=oTzfijeP9jh+KFihZqJL2OPVGbynAufOeHks2Ilom9hZbvwmb9lEkwVY+4wW6Tk9dQ muXk0nh6y0xWrP/9M1ZlxVcm/v7B1daFa2YaFS8dzJeLd7AR49ExVO96LD76dMglBWIi b9XBduBM0tcLC+MkVUPU5v8jbbB/y5j4Gw/gJdKCMiJc9A7E0a9RLH32J4Jn94iGnUcG pvq3ydyoAeHbWJIwi6sOrhDhpyeaiz7BFkmbRBIJV4Zo9wZGvJ9+6IeiPDbGhJW4LLAK yd+pyvUBp3RVd5ykgXaKFvGiAuK9ExEz34TGurGuq3P/xwVpLvW8PXGrtt988h+Imc3H oNUA== 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=s+1c4QFB; 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 z1si11181772wrg.228.2018.02.21.04.19.03; Wed, 21 Feb 2018 04:19:04 -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=s+1c4QFB; 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 900DD2675A7; Wed, 21 Feb 2018 13:18:56 +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 B54842675A6; Wed, 21 Feb 2018 13:18:54 +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 B21FF2675A4 for ; Wed, 21 Feb 2018 13:18:48 +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=aj5JBQ2vtXPwgcAwZGZsxXY/J2uec2eLbS03mmgLfaY=; b=s+1c4QFBH2oF G7bl2WplVODOxNJJVgPIOrx2LXhxu8N85jVipelvuDm+9xHMF1GOl8czWVpZBoiok/JpmN5DrHhBL sydNcEfv7GLytVxCo0xXqJzmJGpV1/stWgMh5GTI9lc1UIrIYfMm4JCONGLDHjpjixFlNShixOCB/ bAKz0=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eoTM6-0007L1-3v; Wed, 21 Feb 2018 12:18:38 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eoTM5-0004KH-KQ; Wed, 21 Feb 2018 12:18:37 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87tvubnln7.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 21 Feb 2018 12:18:37 +0000 Cc: alsa-devel@alsa-project.org, huang lin , Arnaud Pouliquen , Takashi Iwai , Liam Girdwood , Peter Ujfalusi , Mark Brown , Matthias Kaehlcke , Bhumika Goyal Subject: [alsa-devel] Applied "ASoC: dmic: don't use codec anymore" 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: dmic: don't use codec anymore 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 15b7c5de7c0c4f55d529ca71a5a0feca4cf03ab3 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 21 Feb 2018 02:06:29 +0000 Subject: [PATCH] ASoC: dmic: don't use codec anymore commit 6d6c3946d877 ("ASoC: dmic: replace codec to component") replaced codec to component, but commit 05c9b302eda7 ("ASoC: dmic: Add optional wakeup delay") used codec again. This patch fix it up. Fixes: 05c9b302eda7 ("ASoC: dmic: Add optional wakeup delay") Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/dmic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.16.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index bac5bbb2dd59..8c4926df9286 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -37,8 +37,8 @@ struct dmic { static int dmic_aif_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - struct dmic *dmic = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct dmic *dmic = snd_soc_component_get_drvdata(component); switch (event) { case SND_SOC_DAPM_POST_PMU: