From patchwork Wed Mar 26 05:40:33 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiubo Li
X-Patchwork-Id: 3892231
Return-Path:
X-Original-To: patchwork-alsa-devel@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.19.201])
by patchwork2.web.kernel.org (Postfix) with ESMTP id D4D1CBF540
for ;
Wed, 26 Mar 2014 06:36:09 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id 0C32C2021B
for ;
Wed, 26 Mar 2014 06:36:09 +0000 (UTC)
Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243])
by mail.kernel.org (Postfix) with ESMTP id CF9F7201FD
for ;
Wed, 26 Mar 2014 06:36:07 +0000 (UTC)
Received: by alsa0.perex.cz (Postfix, from userid 1000)
id E5C3126537E; Wed, 26 Mar 2014 07:36:01 +0100 (CET)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY,
UNRESOLVED_TEMPLATE autolearn=no version=3.3.1
Received: from alsa0.perex.cz (localhost [IPv6:::1])
by alsa0.perex.cz (Postfix) with ESMTP id 9068A26513D;
Wed, 26 Mar 2014 07:30:32 +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 57DCD265233; Wed, 26 Mar 2014 07:30:31 +0100 (CET)
Received: from co9outboundpool.messaging.microsoft.com
(co9ehsobe003.messaging.microsoft.com [207.46.163.26])
by alsa0.perex.cz (Postfix) with ESMTP id B29D426518B
for ;
Wed, 26 Mar 2014 07:28:41 +0100 (CET)
Received: from mail29-co9-R.bigfish.com (10.236.132.252) by
CO9EHSOBE017.bigfish.com (10.236.130.80) with Microsoft SMTP Server
id 14.1.225.22; Wed, 26 Mar 2014 06:28:40 +0000
Received: from mail29-co9 (localhost [127.0.0.1]) by mail29-co9-R.bigfish.com
(Postfix) with ESMTP id 7D815E01AF;
Wed, 26 Mar 2014 06:28:40 +0000 (UTC)
X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null);
IPV:NLI;
H:mail.freescale.net; RD:none; EFVD:NLI
X-SpamScore: 0
X-BigFish:
VS0(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h8275bh1de097hz2dh2a8h839he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch25f6h2605h268bh1155h)
Received: from mail29-co9 (localhost.localdomain [127.0.0.1]) by mail29-co9
(MessageSwitch) id 139581531993940_16908;
Wed, 26 Mar 2014 06:28:39 +0000 (UTC)
Received: from CO9EHSMHS032.bigfish.com (unknown [10.236.132.230]) by
mail29-co9.bigfish.com (Postfix) with ESMTP id 0DF34320053;
Wed, 26 Mar 2014 06:28:39 +0000 (UTC)
Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS032.bigfish.com
(10.236.130.42) with Microsoft SMTP Server (TLS) id 14.16.227.3;
Wed, 26 Mar 2014 06:28:38 +0000
Received: from tx30smr01.am.freescale.net (10.81.153.31) by
039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP
Server (TLS) id 14.3.158.2; Wed, 26 Mar 2014 06:28:37 +0000
Received: from rock.am.freescale.net (rock.ap.freescale.net [10.193.20.106])
by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id
s2Q6RRnN002319; Tue, 25 Mar 2014 23:28:32 -0700
From: Xiubo Li
To: ,
Date: Wed, 26 Mar 2014 13:40:33 +0800
Message-ID: <1395812433-26410-12-git-send-email-Li.Xiubo@freescale.com>
X-Mailer: git-send-email 1.8.0
In-Reply-To: <1395812433-26410-1-git-send-email-Li.Xiubo@freescale.com>
References: <1395812433-26410-1-git-send-email-Li.Xiubo@freescale.com>
MIME-Version: 1.0
X-OriginatorOrg: freescale.com
X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn%
X-FOPE-CONNECTOR:
Id%0$Dn%FREESCALE.MAIL.ONMICROSOFT.COM$RO%1$TLS%0$FQDN%$TlsDn%
Cc: alsa-devel@alsa-project.org, lars@metafoo.de, shc_work@mail.ru,
tiwai@suse.de, viresh.kumar@linaro.org,
patches@opensource.wolfsonmicro.com,
andrew.smirnov@gmail.com, Xiubo Li ,
akpm@linux-foundation.org, s.trumtrar@pengutronix.de,
rf@opensource.wolfsonmicro.com, ckeepax@opensource.wolfsonmicro.com,
vinod.koul@intel.com
Subject: [alsa-devel] [PATCHv2 11/11] ASoc: wm8997: Remove the
set_cache_io() entirely from ASoC probe.
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: ,
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
X-Virus-Scanned: ClamAV using ClamSMTP
As we can set the CODEC I/O while snd_soc_register_codec(), so the
calling of set_cache_io() from CODEC ASoC probe could be removed
entirely.
And then we can set the CODEC I/O in the device probe instead of
CODEC ASoC probe as earily as possible.
Signed-off-by: Xiubo Li
---
sound/soc/codecs/wm8997.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 004186b..3d50621 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -1051,11 +1051,6 @@ static struct snd_soc_dai_driver wm8997_dai[] = {
static int wm8997_codec_probe(struct snd_soc_codec *codec)
{
struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);
- int ret;
-
- ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap);
- if (ret != 0)
- return ret;
arizona_init_spk(codec);
@@ -1086,9 +1081,17 @@ static unsigned int wm8997_digital_vu[] = {
ARIZONA_DAC_DIGITAL_VOLUME_5R,
};
+struct regmap *wm8997_get_regmap(struct device *dev)
+{
+ struct wm8997_priv *priv = dev_get_drvdata(dev);
+
+ return priv->core.arizona->regmap;
+}
+
static 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,