github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 05:04:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: simple-card: move simple_parse_of()

Browse Source 
Move simple_parse_of() position. No functional change.
This is preparation for code cleanup.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87h5mixj09.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2026-07-02 01:44:39 +00:00 committed by Mark Brown
parent dc59e4fea9
commit dd79f19264
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
sound/soc/generic/simple-card.c
View File

@ -517,44 +517,6 @@ static int simple_populate_aux(struct simple_util_priv *priv)
return simple_ret(priv, ret);
}
static int simple_parse_of(struct simple_util_priv *priv, struct link_info *li)
{
struct snd_soc_card *card = simple_priv_to_card(priv);
int ret;
ret = simple_util_parse_widgets(card, PREFIX);
if (ret < 0)
goto end;
ret = simple_util_parse_routing(card, PREFIX);
if (ret < 0)
goto end;
ret = simple_util_parse_pin_switches(card, PREFIX);
if (ret < 0)
goto end;
/* Single/Muti DAI link(s) & New style of DT node */
memset(li, 0, sizeof(*li));
ret = simple_for_each_link(priv, li,
simple_dai_link_of,
simple_dai_link_of_dpcm);
if (ret < 0)
goto end;
ret = simple_util_parse_card_name(priv, PREFIX);
if (ret < 0)
goto end;
ret = simple_populate_aux(priv);
if (ret < 0)
goto end;
ret = snd_soc_of_parse_aux_devs(card, PREFIX "aux-devs");
end:
return simple_ret(priv, ret);
}
static int simple_count_noml(struct simple_util_priv *priv,
struct device_node *np,
struct device_node *codec,
@ -704,6 +666,44 @@ static int simple_soc_probe(struct snd_soc_card *card)
return simple_ret(priv, ret);
}
static int simple_parse_of(struct simple_util_priv *priv, struct link_info *li)
{
struct snd_soc_card *card = simple_priv_to_card(priv);
int ret;
ret = simple_util_parse_widgets(card, PREFIX);
if (ret < 0)
goto end;
ret = simple_util_parse_routing(card, PREFIX);
if (ret < 0)
goto end;
ret = simple_util_parse_pin_switches(card, PREFIX);
if (ret < 0)
goto end;
/* Single/Muti DAI link(s) & New style of DT node */
memset(li, 0, sizeof(*li));
ret = simple_for_each_link(priv, li,
simple_dai_link_of,
simple_dai_link_of_dpcm);
if (ret < 0)
goto end;
ret = simple_util_parse_card_name(priv, PREFIX);
if (ret < 0)
goto end;
ret = simple_populate_aux(priv);
if (ret < 0)
goto end;
ret = snd_soc_of_parse_aux_devs(card, PREFIX "aux-devs");
end:
return simple_ret(priv, ret);
}
static int simple_probe(struct platform_device *pdev)
{
struct simple_util_priv *priv;