| From f0bf067eb8f8b3cd115960cad74cfe98ff388978 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Fri, 28 Oct 2016 03:38:00 +0000 |
| Subject: [PATCH 108/299] ASoC: simple-scu-card: code sync: tidyup props/link |
| naming |
| |
| 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 synchronizes style to other simple card family so that be enable |
| to easy reviewing. |
| |
| This patch uses dai_link/dai_props instead of links/props. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit 193599264f3eb632f43f83f738b17241f91dbd5a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/generic/simple-scu-card.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| --- a/sound/soc/generic/simple-scu-card.c |
| +++ b/sound/soc/generic/simple-scu-card.c |
| @@ -254,8 +254,8 @@ static int asoc_simple_card_parse_of(str |
| static int asoc_simple_card_probe(struct platform_device *pdev) |
| { |
| struct simple_card_data *priv; |
| - struct snd_soc_dai_link *links; |
| - struct asoc_simple_dai *props; |
| + struct snd_soc_dai_link *dai_link; |
| + struct asoc_simple_dai *dai_props; |
| struct device *dev = &pdev->dev; |
| struct device_node *np = pdev->dev.of_node; |
| int num, ret; |
| @@ -267,13 +267,13 @@ static int asoc_simple_card_probe(struct |
| |
| num = of_get_child_count(np); |
| |
| - props = devm_kzalloc(dev, sizeof(*props) * num, GFP_KERNEL); |
| - links = devm_kzalloc(dev, sizeof(*links) * num, GFP_KERNEL); |
| - if (!props || !links) |
| + dai_props = devm_kzalloc(dev, sizeof(*dai_props) * num, GFP_KERNEL); |
| + dai_link = devm_kzalloc(dev, sizeof(*dai_link) * num, GFP_KERNEL); |
| + if (!dai_props || !dai_link) |
| return -ENOMEM; |
| |
| - priv->dai_props = props; |
| - priv->dai_link = links; |
| + priv->dai_props = dai_props; |
| + priv->dai_link = dai_link; |
| |
| /* Init snd_soc_card */ |
| priv->snd_card.owner = THIS_MODULE; |
