aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-10-27 23:38:00 -0400
committerMark Brown <broonie@kernel.org>2016-10-28 14:24:48 -0400
commit193599264f3eb632f43f83f738b17241f91dbd5a (patch)
tree4f7881863aaad989629f891f4c656762f81f04f9
parent6910e8679ff4d256028003be2451deb31f13948e (diff)
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>
-rw-r--r--sound/soc/generic/simple-scu-card.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
index 1704b187f6ee..348e9a7c4d10 100644
--- 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(struct device_node *node,
254static int asoc_simple_card_probe(struct platform_device *pdev) 254static int asoc_simple_card_probe(struct platform_device *pdev)
255{ 255{
256 struct simple_card_data *priv; 256 struct simple_card_data *priv;
257 struct snd_soc_dai_link *links; 257 struct snd_soc_dai_link *dai_link;
258 struct asoc_simple_dai *props; 258 struct asoc_simple_dai *dai_props;
259 struct device *dev = &pdev->dev; 259 struct device *dev = &pdev->dev;
260 struct device_node *np = pdev->dev.of_node; 260 struct device_node *np = pdev->dev.of_node;
261 int num, ret; 261 int num, ret;
@@ -267,13 +267,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
267 267
268 num = of_get_child_count(np); 268 num = of_get_child_count(np);
269 269
270 props = devm_kzalloc(dev, sizeof(*props) * num, GFP_KERNEL); 270 dai_props = devm_kzalloc(dev, sizeof(*dai_props) * num, GFP_KERNEL);
271 links = devm_kzalloc(dev, sizeof(*links) * num, GFP_KERNEL); 271 dai_link = devm_kzalloc(dev, sizeof(*dai_link) * num, GFP_KERNEL);
272 if (!props || !links) 272 if (!dai_props || !dai_link)
273 return -ENOMEM; 273 return -ENOMEM;
274 274
275 priv->dai_props = props; 275 priv->dai_props = dai_props;
276 priv->dai_link = links; 276 priv->dai_link = dai_link;
277 277
278 /* Init snd_soc_card */ 278 /* Init snd_soc_card */
279 priv->snd_card.owner = THIS_MODULE; 279 priv->snd_card.owner = THIS_MODULE;