From patchwork Mon Dec 4 18:50:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120590 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp1240753edb; Mon, 4 Dec 2017 10:53:35 -0800 (PST) X-Google-Smtp-Source: AGs4zMaZS/pKns//pZTMQzulUmumtaSvPjd8Mh7E2lleZ1qdtNdPhy+rQCaHBxUqjYPvvQ+Rr+l3 X-Received: by 10.28.45.214 with SMTP id t205mr8389573wmt.94.1512413615619; Mon, 04 Dec 2017 10:53:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512413615; cv=none; d=google.com; s=arc-20160816; b=gXd3VhKRApjidmmMLWxrlKcqgypViE7PWsBGRBVjDfoPR0lgdD4DsCQpew2w6S+rv9 6uaqEqksaxE5k2eYe+NND3Z0/+z+qldkDAbltMUzsMkzCZ9JrXlbAiiXltf/wBIqPh2c 4HXOwrodOIxfFWD0v9vZkIIBmA6++j5eA/fuonz2NyjIBQ5PS5W/B9gRvlyUYoiGW9fE H6QiVR9W5So5L+UEGJds9V00h2bhE2OS/Bb7P6WvD6yB8et8tR4JO7FH8zYGWYc6kO4T UIkWxUEA+M9CuNad9tzv5HgJEMzn7EGb/DrFjxDPZwgMBVs9irB/H+SMSLjZbquLWheK 0EBQ== 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=9atHKPTCLichkWmxhvjQdT2wPIbFdkF3FKTuCRmgzwM=; b=tkkz8KGjC8b2NtNxDSSnX9CEg2JMwERVJBryW7Zj02HlSCNL+P9yDviteRXAI65Dzn jebpPrdaK2pXSqMrQ3pdvOcaF9B0WUeOKbDq8ttMBxi45eyAQvTVfJUZlHKElVdWgS6N edNNvenbUs9Z/dhAgERnbntsQIUJaPhzwvbqPkhS8HJiQDa6AKBq/KCiMhNX8gMF5WMx 4UHZQWJeXCHV8bokM+jlOn/QAlQG5+BhYG1ij+yZzzXiLslEUVOTMOQtbz0HQlDBJaet ko6gbXRNPW2lgc4UG32zFhEY6pV/3No+1dtD/5Z4TnGhwakd7Nl+g+lwp45eh8ieAfJ3 cJ2A== 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=FrVnAWmC; 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 64si10783355wri.143.2017.12.04.10.53.35; Mon, 04 Dec 2017 10:53:35 -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=FrVnAWmC; 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 ACBD92676A9; Mon, 4 Dec 2017 19:51:03 +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 6D7A1267727; Mon, 4 Dec 2017 19:51:03 +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 EE4A92676A9 for ; Mon, 4 Dec 2017 19:50:09 +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=McuS6lQf5B3kWyXqA+D9Qxy6Bf8fVO9SHhXoZpwOO7g=; b=FrVnAWmC7nv/ /sOaZbmG4mRcvk7PevYmu5M9+QRtQv/ih9/cgkpeGbUKZPL8FAu3UvVBCXUwVslqgiQjLz84FoH0M fx04IgUTCZjVgbGk6PuhFImLfWEVGmyVnL0MxXm4MmHNNg+GllyyFLsknwLHzrQc4x9xmIVB8XPU6 5TKAQ=; 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 1eLvoc-0000RQ-V1; Mon, 04 Dec 2017 18:50:07 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eLvoc-0000h3-G9; Mon, 04 Dec 2017 18:50:06 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87val3kleo.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 04 Dec 2017 18:50:06 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown , Lars-Peter Subject: [alsa-devel] Applied "ASoC: use snd_soc_component_init_regmap() on wm8997" 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 wm8997 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 1e4a36afe04b8edd9affc41371822a79599b98e0 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 28 Nov 2017 06:03:48 +0000 Subject: [PATCH] ASoC: use snd_soc_component_init_regmap() on wm8997 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/wm8997.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 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/wm8997.c b/sound/soc/codecs/wm8997.c index 77f512767273..cac9b3e7e15d 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -1062,8 +1062,11 @@ static int wm8997_codec_probe(struct snd_soc_codec *codec) struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec); + struct arizona *arizona = priv->core.arizona; int ret; + snd_soc_codec_init_regmap(codec, arizona->regmap); + ret = arizona_init_spk(codec); if (ret < 0) return ret; @@ -1095,17 +1098,9 @@ static unsigned int wm8997_digital_vu[] = { ARIZONA_DAC_DIGITAL_VOLUME_5R, }; -static struct regmap *wm8997_get_regmap(struct device *dev) -{ - struct wm8997_priv *priv = dev_get_drvdata(dev); - - return priv->core.arizona->regmap; -} - static const struct snd_soc_codec_driver soc_codec_dev_wm8997 = { .probe = wm8997_codec_probe, .remove = wm8997_codec_remove, - .get_regmap = wm8997_get_regmap, .idle_bias_off = true,