From patchwork Mon Dec 4 18:49:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120587 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp1238988edb; Mon, 4 Dec 2017 10:51:42 -0800 (PST) X-Google-Smtp-Source: AGs4zMZU3vpn6ClycNgCEpU8rGx+4RVgjWqysBMTGiWtzIrrOIQWRxpYnBO+/jxVDWdqa+DMMvPl X-Received: by 10.28.92.4 with SMTP id q4mr5018383wmb.42.1512413501949; Mon, 04 Dec 2017 10:51:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512413501; cv=none; d=google.com; s=arc-20160816; b=QPXrPf0K0vI0VeoVovcLLSocMzZAkVRw+9YRwEeANBV6KnML3uCLrZHdpqi4oBEb6a DP4wyy9jeqsVmAivKb5RuND/ArI44mJ9BkNQTdEESKc/WSyfdJki9mlIptB/0l1RjQYf NOLgSjH19YIYr4CRW7WgK1IrypCztpvhKkbw0bUdUnLv24vcvzfqmb4G/Mewx2tGAJ3L CmI/q3jJI2kIAwTq1h87jXEiV6aWZMVS6ZzNjBwY4+tIaOYrRisNZjyft1mBif7Iq9Hy s1XPRS/rG9vGGK6DY/P6MMVDQlBnB3sKGXLVCjRUdyVDreM40jmzIcC4PjRomMpVne2c WVqg== 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=cvSdHVrY7UCZsLI5zwJTBFDTe9yWAEGwmi1/1S/Y9+c=; b=qM2peZzZrjGdAeNjeaqLeyMhHozZN4zVvYQEOcpYgJMp8LWKZi92CuuZd12FgqeG6f HYiRF6IGH4Xj0pGFoDOdlZEcXSmN50hBGrhpwR+7JeamdYnnITVZ8NSa5qXFa5uCoZBO juxhohlZ0gNGjQ3unJ2SFNvYZ07X0G4luUrAe0kZMHDhQq+w4NLoDPY7LSA33o1CW5a7 JwG8hEwNdJLuuFRj50ZvyoqP3UoWHTHJy+xJDn5MWI7kUZt0gOPHThmLCzJ5aEvCYx9e j0v8XuypmZ+5q1Nkrjbkyo6ovYVqO79/y00CNdmnkLTd/xDTK8ibGOLTog7RpgWwMeVl eIrA== 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=p9FncXTt; 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 h15si5399876wmc.62.2017.12.04.10.51.40; Mon, 04 Dec 2017 10:51:41 -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=p9FncXTt; 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 D6C76267628; Mon, 4 Dec 2017 19:50:00 +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 386BA267631; Mon, 4 Dec 2017 19:49:59 +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 B412526764A for ; Mon, 4 Dec 2017 19:49:32 +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=C3mB/nfDsRJ8UPvVx8kDug1RCx593uNudEmPifzX3W8=; b=p9FncXTtTui+ aXrUaOm1Gsmc6Jcj/P4XLkipYiCO7riuK9GRXVjh4VUPQketjwcLzslrzL2ly08MX/gJrzkrJGjO0 VxR6hT8tHXo59xThY86CvDljDdqCq0HPaotHg9stubyhwtpQcKNVlvqiVSXiLH3eHLBpTvNbGCAdA 3e4fk=; 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 1eLvo1-0000QF-MN; Mon, 04 Dec 2017 18:49:29 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eLvo1-0000VZ-9R; Mon, 04 Dec 2017 18:49:29 +0000 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87h8wnkl8q.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 04 Dec 2017 18:49:29 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown , Lars-Peter Subject: [alsa-devel] Applied "ASoC: use snd_soc_component_init_regmap() on 88pm860x" 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 88pm860x 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 79b4885967cff17e0344b451e8fc4782013f0c9c Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 28 Nov 2017 06:06:15 +0000 Subject: [PATCH] ASoC: use snd_soc_component_init_regmap() on 88pm860x 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/88pm860x-codec.c | 9 +-------- 1 file changed, 1 insertion(+), 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/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 848c5fe49bc7..be8ea723dff9 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -1319,6 +1319,7 @@ static int pm860x_probe(struct snd_soc_codec *codec) int i, ret; pm860x->codec = codec; + snd_soc_codec_init_regmap(codec, pm860x->regmap); for (i = 0; i < 4; i++) { ret = request_threaded_irq(pm860x->irq[i], NULL, @@ -1348,18 +1349,10 @@ static int pm860x_remove(struct snd_soc_codec *codec) return 0; } -static struct regmap *pm860x_get_regmap(struct device *dev) -{ - struct pm860x_priv *pm860x = dev_get_drvdata(dev); - - return pm860x->regmap; -} - static const struct snd_soc_codec_driver soc_codec_dev_pm860x = { .probe = pm860x_probe, .remove = pm860x_remove, .set_bias_level = pm860x_set_bias_level, - .get_regmap = pm860x_get_regmap, .component_driver = { .controls = pm860x_snd_controls,