summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-08-26 03:09:38 +0000
committerMark Brown <broonie@kernel.org>2016-09-01 21:22:59 +0100
commit2c86dda74ceae739eb3c0ada5cd8f2ddf903ce35 (patch)
tree05487979865f0514bf95db1403e036edb6d7d6d9 /sound
parent0a6c7f2f7890796209896c2239420c8a38dacb60 (diff)
downloadop-kernel-dev-2c86dda74ceae739eb3c0ada5cd8f2ddf903ce35.zip
op-kernel-dev-2c86dda74ceae739eb3c0ada5cd8f2ddf903ce35.tar.gz
ASoC: simple-card: code sync: rename num_link to num
simple sound card family are using very similar style, but because of its historical reason, there are small differences. For example pointer style, function name, caller postion etc... This patch synchronized simple card style to other simple card family. This patch renames num_link to num Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/generic/simple-card.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index c17f851..93163c9 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -385,17 +385,17 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
struct snd_soc_dai_link *dai_link;
struct device_node *np = pdev->dev.of_node;
struct device *dev = &pdev->dev;
- int num_links, ret;
+ int num, ret;
/* Get the number of DAI links */
if (np && of_get_child_by_name(np, PREFIX "dai-link"))
- num_links = of_get_child_count(np);
+ num = of_get_child_count(np);
else
- num_links = 1;
+ num = 1;
/* Allocate the private data and the DAI link array */
priv = devm_kzalloc(dev,
- sizeof(*priv) + sizeof(*dai_link) * num_links,
+ sizeof(*priv) + sizeof(*dai_link) * num,
GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -405,11 +405,11 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
priv->snd_card.owner = THIS_MODULE;
priv->snd_card.dev = dev;
priv->snd_card.dai_link = priv->dai_link;
- priv->snd_card.num_links = num_links;
+ priv->snd_card.num_links = num;
/* Get room for the other properties */
priv->dai_props = devm_kzalloc(dev,
- sizeof(*priv->dai_props) * num_links,
+ sizeof(*priv->dai_props) * num,
GFP_KERNEL);
if (!priv->dai_props)
return -ENOMEM;
OpenPOWER on IntegriCloud