diff options
| author | Kuninori Morimoto | 2016-10-28 05:38:00 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-10-28 20:24:48 +0200 |
| commit | 193599264f3eb632f43f83f738b17241f91dbd5a (patch) | |
| tree | 4f7881863aaad989629f891f4c656762f81f04f9 /sound/soc/generic | |
| parent | ASoC: simple-scu-card: code sync: rename asoc_simple_card_priv (diff) | |
| download | kernel-qcow2-linux-193599264f3eb632f43f83f738b17241f91dbd5a.tar.gz kernel-qcow2-linux-193599264f3eb632f43f83f738b17241f91dbd5a.tar.xz kernel-qcow2-linux-193599264f3eb632f43f83f738b17241f91dbd5a.zip | |
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>
Diffstat (limited to 'sound/soc/generic')
| -rw-r--r-- | sound/soc/generic/simple-scu-card.c | 14 |
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, 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 platform_device *pdev) 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; |