From patchwork Mon Sep 1 04:29:36 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiubo Li
X-Patchwork-Id: 4816331
Return-Path:
X-Original-To: patchwork-linux-arm@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 75FADC0338
for ;
Mon, 1 Sep 2014 05:24:19 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id 871E42017A
for ;
Mon, 1 Sep 2014 05:24:18 +0000 (UTC)
Received: from bombadil.infradead.org (bombadil.infradead.org
[198.137.202.9])
(using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mail.kernel.org (Postfix) with ESMTPS id 8E16520145
for ;
Mon, 1 Sep 2014 05:24:17 +0000 (UTC)
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux))
id 1XOK3d-0006AG-Jt; Mon, 01 Sep 2014 05:21:37 +0000
Received: from mail-bn1lp0141.outbound.protection.outlook.com
([207.46.163.141] helo=na01-bn1-obe.outbound.protection.outlook.com)
by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat
Linux)) id 1XOK3V-00068H-MS
for linux-arm-kernel@lists.infradead.org;
Mon, 01 Sep 2014 05:21:30 +0000
Received: from BY2PR03CA071.namprd03.prod.outlook.com (10.141.249.44) by
BL2PR03MB340.namprd03.prod.outlook.com (10.141.68.24) with Microsoft
SMTP Server (TLS) id 15.0.1015.9; Mon, 1 Sep 2014 05:21:08 +0000
Received: from BY2FFO11FD060.protection.gbl (2a01:111:f400:7c0c::186) by
BY2PR03CA071.outlook.office365.com (2a01:111:e400:2c5d::44) with
Microsoft SMTP Server (TLS) id 15.0.1015.19 via Frontend Transport;
Mon, 1 Sep 2014 05:21:07 +0000
Received: from az84smr01.freescale.net (192.88.158.2) by
BY2FFO11FD060.mail.protection.outlook.com (10.1.15.184) with
Microsoft SMTP Server (TLS) id 15.0.1010.11 via Frontend Transport;
Mon, 1 Sep 2014 05:21:07 +0000
Received: from rock.ap.freescale.net (rock.ap.freescale.net [10.193.20.106])
by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id
s815Kbj6027602; Sun, 31 Aug 2014 22:21:03 -0700
From: Xiubo Li
To: , , ,
, , ,
, , ,
, ,
,
Subject: [PATCHv1 2/7] ASoC: simple-card: Adjust the comments of simple card.
Date: Mon, 1 Sep 2014 12:29:36 +0800
Message-ID: <1409545781-20530-3-git-send-email-Li.Xiubo@freescale.com>
X-Mailer: git-send-email 1.8.0
In-Reply-To: <1409545781-20530-1-git-send-email-Li.Xiubo@freescale.com>
References: <1409545781-20530-1-git-send-email-Li.Xiubo@freescale.com>
X-EOPAttributedMessage: 0
X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI;
EFV:NLI; SFV:NSPM;
SFS:(6009001)(189002)(199003)(104016003)(85306004)(81342001)(68736004)(19580395003)(26826002)(102836001)(76482001)(36756003)(31966008)(83322001)(88136002)(104166001)(81542001)(44976005)(80022001)(229853001)(4396001)(64706001)(47776003)(20776003)(50226001)(87286001)(107046002)(95666004)(62966002)(99396002)(85852003)(48376002)(77156001)(50986999)(90102001)(74502001)(92566001)(106466001)(19580405001)(50466002)(6806004)(21056001)(77982001)(89996001)(79102001)(69596002)(2201001)(84676001)(105606002)(87936001)(74662001)(83072002)(46102001)(86362001)(93916002)(92726001)(97736001)(81156004)(76176999)(921003)(1121002)(21314002)(83996005)(2101003);
DIR:OUT; SFP:; SCL:1; SRVR:BL2PR03MB340; H:az84smr01.freescale.net;
FPR:;
MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en;
MIME-Version: 1.0
X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:;
X-Forefront-PRVS: 03218BFD9F
Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not
designate 192.88.158.2 as permitted sender)
receiver=protection.outlook.com;
client-ip=192.88.158.2; helo=az84smr01.freescale.net;
Authentication-Results: spf=fail (sender IP is 192.88.158.2)
smtp.mailfrom=Li.Xiubo@freescale.com;
X-OriginatorOrg: freescale.com
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
X-CRM114-CacheID: sfid-20140831_222129_807796_4E23E8D4
X-CRM114-Status: UNSURE ( 9.46 )
X-CRM114-Notice: Please train this message.
X-Spam-Score: -0.7 (/)
Cc: Xiubo Li , linux-kernel@vger.kernel.org
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id:
List-Unsubscribe:
,
List-Archive:
List-Post:
List-Help:
List-Subscribe:
,
Sender: "linux-arm-kernel"
Errors-To:
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE,
RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP
Signed-off-by: Xiubo Li
---
sound/soc/generic/simple-card.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index d45c8dd..e9d5a69 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -131,7 +131,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
*daifmt &= ~(SND_SOC_DAIFMT_MASTER_MASK | SND_SOC_DAIFMT_FORMAT_MASK);
/*
- * get node via "sound-dai = <&phandle port>"
+ * Get node via "sound-dai = <&phandle port>"
* it will be used as xxx_of_node on soc_bind_dai_link()
*/
node = of_parse_phandle(np, "sound-dai", 0);
@@ -139,12 +139,12 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
return -ENODEV;
*p_node = node;
- /* get dai->name */
+ /* Get dai->name */
ret = snd_soc_of_get_dai_name(np, name);
if (ret < 0)
return ret;
- /* parse TDM slot */
+ /* Parse TDM slot */
ret = snd_soc_of_parse_tdm_slot(np, &dai->slots, &dai->slot_width);
if (ret)
return ret;
@@ -189,7 +189,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
daifmt &= (SND_SOC_DAIFMT_MASTER_MASK | SND_SOC_DAIFMT_FORMAT_MASK);
dai_props->cpu_dai.fmt = dai_props->codec_dai.fmt = daifmt;
- /* Parse CPU DAI */
+ /* Parse CPU DAI node */
np = of_get_child_by_name(node, "cpu");
if (!np) {
ret = -EINVAL;
@@ -207,7 +207,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
dai_props->cpu_dai.fmt |= daifmt;
of_node_put(np);
- /* Parse CODEC DAI */
+ /* Parse CODEC DAI node */
np = of_get_child_by_name(node, "codec");
if (!np) {
ret = -EINVAL;
@@ -229,10 +229,10 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
dai_props->codec_dai.fmt |= daifmt;
- /* simple-card assumes platform == cpu */
+ /* Simple Card assumes platform == cpu */
dai_link->platform_of_node = dai_link->cpu_of_node;
- /* Link name is created from CPU/CODEC dai name */
+ /* DAI Link's name is created from CPU/CODEC dai name */
name = devm_kzalloc(dev,
strlen(dai_link->cpu_dai_name) +
strlen(dai_link->codec_dai_name) + 2,
@@ -254,7 +254,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
dai_props->codec_dai.sysclk);
/*
- * soc_bind_dai_link() will check cpu name
+ * asoc_bind_dai_link() will check cpu name
* after of_node matching if dai_link has cpu_dai_name.
* but, it will never match if name was created by fmt_single_name()
* remove cpu_dai_name to escape name matching.
@@ -296,10 +296,10 @@ static int asoc_simple_card_parse_of(struct device_node *node,
u32 val;
int ret, i = 0;
- /* parsing the card name from DT */
+ /* Parse the card name from DT */
snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
- /* off-codec widgets */
+ /* Parse off-codec widgets */
if (of_property_read_bool(node, "simple-audio-card,widgets")) {
ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card,
"simple-audio-card,widgets");
@@ -352,13 +352,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
int num_links, ret;
- /* get the number of DAI links */
+ /* Get the number of DAI links */
if (np && of_get_child_by_name(np, "simple-audio-card,dai-link"))
num_links = of_get_child_count(np);
else
return -EINVAL;
- /* allocate the private data and the DAI link array */
+ /* Allocate the private data and the DAI link array */
priv = devm_kzalloc(dev,
sizeof(*priv) + sizeof(*dai_link) * num_links,
GFP_KERNEL);
@@ -366,7 +366,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
return -ENOMEM;
/*
- * init snd_soc_card
+ * Init snd_soc_card
*/
priv->snd_card.owner = THIS_MODULE;
priv->snd_card.dev = dev;
@@ -374,7 +374,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
priv->snd_card.dai_link = dai_link;
priv->snd_card.num_links = num_links;
- /* get room for the other properties */
+ /* Get room for the other properties */
priv->dai_props = devm_kzalloc(dev,
sizeof(*priv->dai_props) * num_links,
GFP_KERNEL);