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: merge extra method into simple_parse_of()

Browse Source 
Current simple_probe() calls many code before/after simple_parse_of().
This is because it had supported platform style probe, but is no longer
exist.

We can merge all into simple_parse_of(), same as Audio Graph Card/Cars2.
No functional change.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87fr22xizz.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:48 +00:00 committed by Mark Brown
parent dd79f19264
commit 7f20b9b05b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -666,10 +666,31 @@ 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)
static int simple_parse_of(struct simple_util_priv *priv)
{
struct snd_soc_card *card = simple_priv_to_card(priv);
int ret;
struct device *dev = card->dev;
int ret = -EINVAL;
if (!dev)
goto end;
ret = -ENOMEM;
struct link_info *li __free(kfree) = kzalloc_obj(*li);
if (!li)
goto end;
ret = simple_get_dais_count(priv, li);
if (ret < 0)
goto end;
ret = -EINVAL;
if (!li->link)
goto end;
ret = simple_util_init_priv(priv, li);
if (ret < 0)
goto end;
ret = simple_util_parse_widgets(card, PREFIX);
if (ret < 0)
@ -689,17 +710,30 @@ static int simple_parse_of(struct simple_util_priv *priv, struct link_info *li)
simple_dai_link_of,
simple_dai_link_of_dpcm);
if (ret < 0)
goto end;
goto err;
ret = simple_util_parse_card_name(priv, PREFIX);
if (ret < 0)
goto end;
goto err;
ret = simple_populate_aux(priv);
if (ret < 0)
goto end;
goto err;
ret = snd_soc_of_parse_aux_devs(card, PREFIX "aux-devs");
if (ret < 0)
goto err;
snd_soc_card_set_drvdata(card, priv);
simple_util_debug_info(priv);
ret = devm_snd_soc_register_card(dev, card);
err:
if (ret < 0) {
simple_util_clean_reference(card);
return dev_err_probe(dev, ret, "parse error\n");
}
end:
return simple_ret(priv, ret);
}
@ -709,7 +743,6 @@ static int simple_probe(struct platform_device *pdev)
struct simple_util_priv *priv;
struct device *dev = &pdev->dev;
struct snd_soc_card *card;
int ret;
/* Allocate the private data and the DAI link array */
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@ -722,42 +755,7 @@ static int simple_probe(struct platform_device *pdev)
card->probe = simple_soc_probe;
card->driver_name = "simple-card";
ret = -ENOMEM;
struct link_info *li __free(kfree) = kzalloc_obj(*li);
if (!li)
goto end;
ret = simple_get_dais_count(priv, li);
if (ret < 0)
goto end;
ret = -EINVAL;
if (!li->link)
goto end;
ret = simple_util_init_priv(priv, li);
if (ret < 0)
goto end;
ret = simple_parse_of(priv, li);
if (ret < 0) {
dev_err_probe(dev, ret, "parse error\n");
goto err;
}
snd_soc_card_set_drvdata(card, priv);
simple_util_debug_info(priv);
ret = devm_snd_soc_register_card(dev, card);
if (ret < 0)
goto err;
return 0;
err:
simple_util_clean_reference(card);
end:
return dev_err_probe(dev, ret, "parse error\n");
return simple_parse_of(priv);
}
static const struct of_device_id simple_of_match[] = {