From patchwork Mon Dec 4 18:49:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120588 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp1239364edb; Mon, 4 Dec 2017 10:52:06 -0800 (PST) X-Google-Smtp-Source: AGs4zMat58gKQzAkMPc5qegpSy4xMVbDCb87/Jplf3p2yHyFDE/zz9P/29/Mr1hz97+o/aoCJCVj X-Received: by 10.223.167.76 with SMTP id e12mr14753093wrd.204.1512413526272; Mon, 04 Dec 2017 10:52:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512413526; cv=none; d=google.com; s=arc-20160816; b=lmIlmC+w+opvM2y+DOAd1M4QEzXpiGPAc2LtPoKfcEtuhdubTPjVEdfQ8YpVlxB/6R Rh89vmKIM2VayagcFwAo98/AzUCOqbqLOtXsiXnI6QP/og9/Te4u/i/Bgh+Ezu1aX8Vn Xyq1erbORDlmy455MCrvJjSqlfjN7Uk/jLghN5FtzqmaKhrQyw7Ar3wR+eayei+r+tq7 aepY5a9/wom8izfMWVXB6FLJRY0hGnqG/UkesxhcvB1GMWey1gfPfXs++9KsEG/9sKsB 3enLP+JPnNbaV5nj+eZxGcbGmN0Zs+vYFMJKeUBVyFixBeWS/XVWcfDR7GSovuuPwh67 MNmA== 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=6KQZNDAPWGTqlhk+3mW4u33/mBb/Jg+nCHtd5XoPgQE=; b=uHpSJHzxmRn8k+5eAXVQRvUetX6JoNbJeUmR4WmrrogSZlrncJeX/iqwa3TmQ76qzk XFWQuLu6WfZjmgdNJS0ARg+9xWTN1XYqkvpMdwDcN0UZAgifgkHWtpPCFyp3XRRemEim D1bbjeQHhDJcIYBseVTX865zI5y7EWvFpNQHW8jRbgffcPxQQK+DJwcG1BO9JPOeCpNX 8ipfGiSefTxbIvXhXkMuGAxmckkGk4fNI5MD/szeccDvXSrgX3X3KsMswdZmdYjpNirL ZPLH73AhO+PO7TA0pXfQaMVSL5MK8taYxwfNDucWzwUPUO78AGeB+iqiAtwW7Luq3fa0 Mz3w== 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=ttZwZ7Tn; 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 2si11094409wrn.67.2017.12.04.10.52.06; Mon, 04 Dec 2017 10:52:06 -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=ttZwZ7Tn; 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 E0DEA2676AD; Mon, 4 Dec 2017 19:50:16 +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 5C97726768E; Mon, 4 Dec 2017 19:50:15 +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 86C68267664 for ; Mon, 4 Dec 2017 19:49:41 +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=XsWXJJUZi6EG1EHRUhevZWUgfeuycj7CM2cBlp44PLo=; b=ttZwZ7TnUPQj 0TH78Bzpa5u2ZNCBLY5rNis51PyqmLwmc2LCJwF1oH2bX2BRm7EJgwF7jiLo4f0nIR9xX3se7X4Rn 6vvNc3DYQBHF8t2PCHM68InlsXvmH9geSY79RMrcH4vVATYd8wXKzSunG50chXL5ITYPi9WR13cs8 LG3rc=; 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 1eLvoA-0000QU-IG; Mon, 04 Dec 2017 18:49:38 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eLvoA-0000Xw-4S; Mon, 04 Dec 2017 18:49:38 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87k21jkl9r.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 04 Dec 2017 18:49:38 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown , Lars-Peter Subject: [alsa-devel] Applied "ASoC: use snd_soc_component_init_regmap() on cq93vc" 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: use snd_soc_component_init_regmap() on cq93vc 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 60e1780ef27c626c7eaabae6103a218102b6e6ba Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 28 Nov 2017 06:05:46 +0000 Subject: [PATCH] ASoC: use snd_soc_component_init_regmap() on cq93vc To setup regmap, ALSA SoC has snd_soc_component_init_regmap() and .get_regmap. But these are duplicated feature. Let's use snd_soc_component_init_regmap() and remove .get_regmap Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/cq93vc.c | 10 ++++++---- 1 file changed, 6 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/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 6ed2cc374768..3bf93652bb31 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -121,17 +121,19 @@ static struct snd_soc_dai_driver cq93vc_dai = { .ops = &cq93vc_dai_ops, }; -static struct regmap *cq93vc_get_regmap(struct device *dev) +static int cq93vc_probe(struct snd_soc_component *component) { - struct davinci_vc *davinci_vc = dev->platform_data; + struct davinci_vc *davinci_vc = component->dev->platform_data; - return davinci_vc->regmap; + snd_soc_component_init_regmap(component, davinci_vc->regmap); + + return 0; } static const struct snd_soc_codec_driver soc_codec_dev_cq93vc = { .set_bias_level = cq93vc_set_bias_level, - .get_regmap = cq93vc_get_regmap, .component_driver = { + .probe = cq93vc_probe, .controls = cq93vc_snd_controls, .num_controls = ARRAY_SIZE(cq93vc_snd_controls), },