From: Xiubo Li <Li.Xiubo@freescale.com>
To: broonie@kernel.org, lgirdwood@gmail.com, perex@perex.cz,
tiwai@suse.de, kuninori.morimoto.gx@renesas.com, moinejf@free.fr,
andrew@lunn.ch, jsarha@ti.com, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org,
alsa-devel@alsa-project.org, shawn.guo@freescale.com
Cc: linux-kernel@vger.kernel.org, Xiubo Li <Li.Xiubo@freescale.com>
Subject: [PATCHv1 2/7] ASoC: simple-card: Adjust the comments of simple card.
Date: Mon, 1 Sep 2014 12:29:36 +0800 [thread overview]
Message-ID: <1409545781-20530-3-git-send-email-Li.Xiubo@freescale.com> (raw)
In-Reply-To: <1409545781-20530-1-git-send-email-Li.Xiubo@freescale.com>
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
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);
--
1.8.4
next prev parent reply other threads:[~2014-09-01 4:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-01 4:29 [PATCHv1 0/7] simple-card: simplify the code Xiubo Li
2014-09-01 4:29 ` [PATCHv1 1/7] ASoC: simple-card: Merge single and muti DAI link code Xiubo Li
[not found] ` <1409545781-20530-2-git-send-email-Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2014-09-01 7:42 ` [alsa-devel] " Kuninori Morimoto
2014-09-01 7:48 ` Li.Xiubo
2014-09-01 7:50 ` Kuninori Morimoto
2014-09-02 9:15 ` [alsa-devel] " Li.Xiubo
2014-09-01 15:05 ` Jason Cooper
2014-09-01 13:34 ` Andrew Lunn
2014-09-01 15:13 ` Mark Brown
[not found] ` <20140901151356.GB29327-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-09-02 3:22 ` Li.Xiubo-KZfg59tc24xl57MIdRCFDg
2014-09-01 4:29 ` Xiubo Li [this message]
2014-09-01 4:29 ` [PATCHv1 3/7] ASoC: dts: vf610-twr: To support simple card newest style Xiubo Li
2014-09-01 4:29 ` [PATCHv1 4/7] ASoC: dts: kirkwood-t5325: " Xiubo Li
2014-09-01 13:41 ` Andrew Lunn
[not found] ` <20140901134148.GB11312-g2DYL2Zd6BY@public.gmane.org>
2014-09-02 9:08 ` Li.Xiubo-KZfg59tc24xl57MIdRCFDg
2014-09-01 4:29 ` [PATCHv1 5/7] ASoC: dts: r8a7740-armadillo800eva-reference: " Xiubo Li
2014-09-01 4:29 ` [PATCHv1 6/7] ASoC: dts: sh73a0-kzm9g-reference: " Xiubo Li
2014-09-01 4:29 ` [PATCHv1 7/7] ASoC: dts: kirkwood-openrd-client: " Xiubo Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409545781-20530-3-git-send-email-Li.Xiubo@freescale.com \
--to=li.xiubo@freescale.com \
--cc=alsa-devel@alsa-project.org \
--cc=andrew@lunn.ch \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jsarha@ti.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=moinejf@free.fr \
--cc=perex@perex.cz \
--cc=shawn.guo@freescale.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).