From patchwork Mon Dec 4 18:49:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120586 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp1238803edb; Mon, 4 Dec 2017 10:51:29 -0800 (PST) X-Google-Smtp-Source: AGs4zMZcdlboaz+wmrBGl3XRWFG7uIRFWkKaSvb2i2IFU7U0YhAqqDtEmkOOAGsMWU+sVv6sLbfJ X-Received: by 10.223.150.46 with SMTP id b43mr13999189wra.5.1512413489313; Mon, 04 Dec 2017 10:51:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512413489; cv=none; d=google.com; s=arc-20160816; b=S6pjy19P5ch6OMx2YErEv5VbZtltZWfElgtQoABdG1OL2T0PlzcyGgC6PyqOh0NbTf 63pjpEhVp7AW6ivVMorqvMBf2oSKbBPJUfmXhNsCfqYOkfHdddf5k4wyGa9DILufLVVH REoH/iibTW1jHmxiaqKI+KyuBaJHANMhv9YDeykLkSe3uNr2WBT6jS+RGCs7Z6RttfCx hF6PVZDL5lQYxrHs+XMjUkQ7wfIMXpxdzFSprCSygOWSi9PoVFWCeolp5ea3aX1b0UXK QwcugM7Tbkv1P3VzunoI8p0s5YUU+vxoee8BfrvYBeTOH5rUwP6EjRLZugyjXU6AGZj1 pXKA== 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=Xg3ZBGRcoG4tIPj1pDqFybd1gmSrW0/3siYaZ36py9k=; b=odpMJ0kpulcpvOjn8q/af6Zk3sOrd6MebFBPseacU4vSXofH6V9Kdmnbq+Z4XMv5tE 3JdopFoOx2NeemV2FyMR/DjZnU8sxsZ1NZt+QnFT+6j7octyvzdG1Cb+11cHgD9ZC4qu SXAEhUKhCek6tncFksScidyKP8Tkl4/lgcViEWK3cq6L35ptGYFzX4Vhj+VWBzfEHilE 7AbKxwjm3t9WZ7vdeAb/npGUyUErEVP6DeveZegWIc0SUZX/c0siRUSHjEkd/RGSRVIG RgPaZLCkhFiDJslXOJk6jjOeunU755a8nuu0qDWfK8GSSPwgd+NRwojLQS8pEqpw/mbx 5THQ== 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=vr/GsJ+I; 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 k25si10882560wrd.111.2017.12.04.10.51.29; Mon, 04 Dec 2017 10:51:29 -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=vr/GsJ+I; 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 489F926762F; Mon, 4 Dec 2017 19:49:50 +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 72CD826767A; Mon, 4 Dec 2017 19:49:49 +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 9F19026762F for ; Mon, 4 Dec 2017 19:49:29 +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=NmZ6RWLWNlY8yhMCrEWQlpdj81+kFV9DZ/zE3gHDiFc=; b=vr/GsJ+IJYVX 8g9f+fN6bur3U/bLlxE1/H9HDNe/ajuGGQEmL909eQWKiYERThwYQCDX9+FgZqX7TVx2oqzpR3WZe VQdUWYP1GqnGk5OXvGT2DSMu0xchCIp00Epp69XDS/olHO3gDaCUDO/snbzHF+NvA4kZa+cifyenB Mn8/4=; 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 1eLvny-0000Q8-KR; Mon, 04 Dec 2017 18:49:26 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eLvny-0000UN-6U; Mon, 04 Dec 2017 18:49:26 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87fuc7kl88.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 04 Dec 2017 18:49:26 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown , Lars-Peter Subject: [alsa-devel] Applied "ASoC: use snd_soc_component_init_regmap() on msm8916" 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 msm8916 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 42e193cdcb9e197e788638bd33bab3d1905815f6 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 28 Nov 2017 06:06:29 +0000 Subject: [PATCH] ASoC: use snd_soc_component_init_regmap() on msm8916 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/msm8916-wcd-analog.c | 8 ++------ 1 file changed, 2 insertions(+), 6 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/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index 066ea2f4ce7b..44062bb7bf2f 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -712,6 +712,8 @@ static int pm8916_wcd_analog_probe(struct snd_soc_codec *codec) return err; } + snd_soc_codec_init_regmap(codec, + dev_get_regmap(codec->dev->parent, NULL)); snd_soc_codec_set_drvdata(codec, priv); priv->pmic_rev = snd_soc_read(codec, CDC_D_REVISION1); priv->codec_version = snd_soc_read(codec, CDC_D_PERPH_SUBTYPE); @@ -943,11 +945,6 @@ static int pm8916_wcd_analog_set_jack(struct snd_soc_codec *codec, return 0; } -static struct regmap *pm8916_get_regmap(struct device *dev) -{ - return dev_get_regmap(dev->parent, NULL); -} - static irqreturn_t mbhc_btn_release_irq_handler(int irq, void *arg) { struct pm8916_wcd_analog_priv *priv = arg; @@ -1082,7 +1079,6 @@ static const struct snd_soc_codec_driver pm8916_wcd_analog = { .probe = pm8916_wcd_analog_probe, .remove = pm8916_wcd_analog_remove, .set_jack = pm8916_wcd_analog_set_jack, - .get_regmap = pm8916_get_regmap, .component_driver = { .controls = pm8916_wcd_analog_snd_controls, .num_controls = ARRAY_SIZE(pm8916_wcd_analog_snd_controls),