android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: tidyup for_each_card_prelinks() dai_link

Browse Source 
commit 7fe072b4df ("ASoC: add for_each_card_prelinks() macro")
added new for_each_card_prelinks() macro, but it had typo.
This patch fixup it

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-09-21 07:46:28 +00:00 committed by Mark Brown
parent fc795bf722
commit 0310820c27
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/mediatek/mt2701/mt2701-cs42448.c
View File

@ -311,9 +311,9 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
if (dai_links->platform_name) if (dai_link->platform_name)
continue; continue;
dai_links->platform_of_node = platform_node; dai_link->platform_of_node = platform_node;
} }
card->dev = dev; card->dev = dev;
@ -326,9 +326,9 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
if (dai_links->codec_name) if (dai_link->codec_name)
continue; continue;
dai_links->codec_of_node = codec_node; dai_link->codec_of_node = codec_node;
} }
codec_node_bt_mrg = of_parse_phandle(pdev->dev.of_node, codec_node_bt_mrg = of_parse_phandle(pdev->dev.of_node,

8
sound/soc/mediatek/mt2701/mt2701-wm8960.c
View File

@ -107,9 +107,9 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
if (dai_links->platform_name) if (dai_link->platform_name)
continue; continue;
dai_links->platform_of_node = platform_node; dai_link->platform_of_node = platform_node;
} }
card->dev = &pdev->dev; card->dev = &pdev->dev;
@ -122,9 +122,9 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
if (dai_links->codec_name) if (dai_link->codec_name)
continue; continue;
dai_links->codec_of_node = codec_node; dai_link->codec_of_node = codec_node;
} }
ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); ret = snd_soc_of_parse_audio_routing(card, "audio-routing");

6
sound/soc/mediatek/mt6797/mt6797-mt6351.c
View File

@ -172,7 +172,7 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev)
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
if (dai_link->platform_name) if (dai_link->platform_name)
continue; continue;
dai_links->platform_of_node = platform_node; dai_link->platform_of_node = platform_node;
} }
codec_node = of_parse_phandle(pdev->dev.of_node, codec_node = of_parse_phandle(pdev->dev.of_node,
@ -183,9 +183,9 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
if (dai_links->codec_name) if (dai_link->codec_name)
continue; continue;
dai_links->codec_of_node = codec_node; dai_link->codec_of_node = codec_node;
} }
ret = devm_snd_soc_register_card(&pdev->dev, card); ret = devm_snd_soc_register_card(&pdev->dev, card);