git
/
linux
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: simple-card-utils: use snd_soc_ret() 

We can use snd_soc_ret() to indicate error message when return.
Let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87a5b12qlg.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2025-02-05 00:16:27 +00:00 committed by Mark Brown
parent a0ef5b4b10
commit 2d7395b23d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 115 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sound/simple_card_utils.h
View File

@ -142,14 +142,14 @@ int simple_util_parse_daifmt(struct device *dev,
struct device_node *codec, struct device_node *codec,
char *prefix, char *prefix,
unsigned int *retfmt); unsigned int *retfmt);
int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np, int simple_util_parse_tdm_width_map(struct simple_util_priv *priv, struct device_node *np,
struct simple_util_dai *dai); struct simple_util_dai *dai);
__printf(3, 4) __printf(3, 4)
int simple_util_set_dailink_name(struct device *dev, int simple_util_set_dailink_name(struct simple_util_priv *priv,
struct snd_soc_dai_link *dai_link, struct snd_soc_dai_link *dai_link,
const char *fmt, ...); const char *fmt, ...);
int simple_util_parse_card_name(struct snd_soc_card *card, int simple_util_parse_card_name(struct simple_util_priv *priv,
char *prefix); char *prefix);
int simple_util_parse_clk(struct device *dev, int simple_util_parse_clk(struct device *dev,
@ -201,7 +201,7 @@ void simple_util_remove(struct platform_device *pdev);
int graph_util_card_probe(struct snd_soc_card *card); int graph_util_card_probe(struct snd_soc_card *card);
int graph_util_is_ports0(struct device_node *port); int graph_util_is_ports0(struct device_node *port);
int graph_util_parse_dai(struct device *dev, struct device_node *ep, int graph_util_parse_dai(struct simple_util_priv *priv, struct device_node *ep,
struct snd_soc_dai_link_component *dlc, int *is_single_link); struct snd_soc_dai_link_component *dlc, int *is_single_link);
void graph_util_parse_link_direction(struct device_node *np, void graph_util_parse_link_direction(struct device_node *np,

6
sound/soc/generic/audio-graph-card.c
View File

@ -111,7 +111,7 @@ static int graph_parse_node(struct simple_util_priv *priv,
dai = simple_props_to_dai_codec(dai_props, 0); dai = simple_props_to_dai_codec(dai_props, 0);
} }
ret = graph_util_parse_dai(dev, ep, dlc, cpu); ret = graph_util_parse_dai(priv, ep, dlc, cpu);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -183,7 +183,7 @@ static int graph_link_init(struct simple_util_priv *priv,
if (priv->ops) if (priv->ops)
dai_link->ops = priv->ops; dai_link->ops = priv->ops;
return simple_util_set_dailink_name(dev, dai_link, name); return simple_util_set_dailink_name(priv, dai_link, name);
} }
static int graph_dai_link_of_dpcm(struct simple_util_priv *priv, static int graph_dai_link_of_dpcm(struct simple_util_priv *priv,
@ -586,7 +586,7 @@ int audio_graph_parse_of(struct simple_util_priv *priv, struct device *dev)
if (ret < 0) if (ret < 0)
goto err; goto err;
ret = simple_util_parse_card_name(card, NULL); ret = simple_util_parse_card_name(priv, NULL);
if (ret < 0) if (ret < 0)
goto err; goto err;

14
sound/soc/generic/audio-graph-card2.c
View File

@ -409,7 +409,7 @@ static int __graph_parse_node(struct simple_util_priv *priv,
dai = simple_props_to_dai_codec(dai_props, idx); dai = simple_props_to_dai_codec(dai_props, idx);
} }
ret = graph_util_parse_dai(dev, ep, dlc, &is_single_links); ret = graph_util_parse_dai(priv, ep, dlc, &is_single_links);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -417,7 +417,7 @@ static int __graph_parse_node(struct simple_util_priv *priv,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = simple_util_parse_tdm_width_map(dev, ep, dai); ret = simple_util_parse_tdm_width_map(priv, ep, dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -443,22 +443,22 @@ static int __graph_parse_node(struct simple_util_priv *priv,
case GRAPH_NORMAL: case GRAPH_NORMAL:
/* run is_cpu only. see audio_graph2_link_normal() */ /* run is_cpu only. see audio_graph2_link_normal() */
if (is_cpu) if (is_cpu)
simple_util_set_dailink_name(dev, dai_link, "%s%s-%s%s", simple_util_set_dailink_name(priv, dai_link, "%s%s-%s%s",
cpus->dai_name, cpu_multi, cpus->dai_name, cpu_multi,
codecs->dai_name, codec_multi); codecs->dai_name, codec_multi);
break; break;
case GRAPH_DPCM: case GRAPH_DPCM:
if (is_cpu) if (is_cpu)
simple_util_set_dailink_name(dev, dai_link, "fe.%pOFP.%s%s", simple_util_set_dailink_name(priv, dai_link, "fe.%pOFP.%s%s",
cpus->of_node, cpus->dai_name, cpu_multi); cpus->of_node, cpus->dai_name, cpu_multi);
else else
simple_util_set_dailink_name(dev, dai_link, "be.%pOFP.%s%s", simple_util_set_dailink_name(priv, dai_link, "be.%pOFP.%s%s",
codecs->of_node, codecs->dai_name, codec_multi); codecs->of_node, codecs->dai_name, codec_multi);
break; break;
case GRAPH_C2C: case GRAPH_C2C:
/* run is_cpu only. see audio_graph2_link_c2c() */ /* run is_cpu only. see audio_graph2_link_c2c() */
if (is_cpu) if (is_cpu)
simple_util_set_dailink_name(dev, dai_link, "c2c.%s%s-%s%s", simple_util_set_dailink_name(priv, dai_link, "c2c.%s%s-%s%s",
cpus->dai_name, cpu_multi, cpus->dai_name, cpu_multi,
codecs->dai_name, codec_multi); codecs->dai_name, codec_multi);
break; break;
@ -1332,7 +1332,7 @@ int audio_graph2_parse_of(struct simple_util_priv *priv, struct device *dev,
if (ret < 0) if (ret < 0)
goto err; goto err;
ret = simple_util_parse_card_name(card, NULL); ret = simple_util_parse_card_name(priv, NULL);
if (ret < 0) if (ret < 0)
goto err; goto err;

162
sound/soc/generic/simple-card-utils.c
View File

@ -15,6 +15,13 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/simple_card_utils.h> #include <sound/simple_card_utils.h>
#define simple_ret(priv, ret) _simple_ret(priv, __func__, ret)
static inline int _simple_ret(struct simple_util_priv *priv,
const char *func, int ret)
{
return snd_soc_ret(simple_priv_to_dev(priv), ret, "at %s()\n", func);
}
int simple_util_get_sample_fmt(struct simple_util_data *data) int simple_util_get_sample_fmt(struct simple_util_data *data)
{ {
int i; int i;
@ -133,33 +140,42 @@ int simple_util_parse_daifmt(struct device *dev,
} }
EXPORT_SYMBOL_GPL(simple_util_parse_daifmt); EXPORT_SYMBOL_GPL(simple_util_parse_daifmt);
int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np, int simple_util_parse_tdm_width_map(struct simple_util_priv *priv, struct device_node *np,
struct simple_util_dai *dai) struct simple_util_dai *dai)
{ {
struct device *dev = simple_priv_to_dev(priv);
int n, i, ret; int n, i, ret;
u32 *p; u32 *p;
/*
* NOTE
*
* Clang doesn't allow to use "goto end" before calling __free(),
* because it bypasses the initialization. Use simple_ret() directly.
*/
n = of_property_count_elems_of_size(np, "dai-tdm-slot-width-map", sizeof(u32)); n = of_property_count_elems_of_size(np, "dai-tdm-slot-width-map", sizeof(u32));
if (n <= 0) if (n <= 0)
return 0; return 0;
if (n % 3) { if (n % 3) {
dev_err(dev, "Invalid number of cells for dai-tdm-slot-width-map\n"); dev_err(dev, "Invalid number of cells for dai-tdm-slot-width-map\n");
return -EINVAL; return simple_ret(priv, -EINVAL); /* see NOTE */
} }
ret = -ENOMEM;
dai->tdm_width_map = devm_kcalloc(dev, n, sizeof(*dai->tdm_width_map), GFP_KERNEL); dai->tdm_width_map = devm_kcalloc(dev, n, sizeof(*dai->tdm_width_map), GFP_KERNEL);
if (!dai->tdm_width_map) if (!dai->tdm_width_map)
return -ENOMEM; return simple_ret(priv, ret); /* see NOTE */
u32 *array_values __free(kfree) = kcalloc(n, sizeof(*array_values), u32 *array_values __free(kfree) = kcalloc(n, sizeof(*array_values), GFP_KERNEL);
GFP_KERNEL);
if (!array_values) if (!array_values)
return -ENOMEM; goto end;
ret = of_property_read_u32_array(np, "dai-tdm-slot-width-map", array_values, n); ret = of_property_read_u32_array(np, "dai-tdm-slot-width-map", array_values, n);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Could not read dai-tdm-slot-width-map: %d\n", ret); dev_err(dev, "Could not read dai-tdm-slot-width-map: %d\n", ret);
return ret; goto end;
} }
p = array_values; p = array_values;
@ -170,15 +186,17 @@ int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np,
} }
dai->n_tdm_widths = i; dai->n_tdm_widths = i;
ret = 0;
return 0; end:
return simple_ret(priv, ret);
} }
EXPORT_SYMBOL_GPL(simple_util_parse_tdm_width_map); EXPORT_SYMBOL_GPL(simple_util_parse_tdm_width_map);
int simple_util_set_dailink_name(struct device *dev, int simple_util_set_dailink_name(struct simple_util_priv *priv,
struct snd_soc_dai_link *dai_link, struct snd_soc_dai_link *dai_link,
const char *fmt, ...) const char *fmt, ...)
{ {
struct device *dev = simple_priv_to_dev(priv);
va_list ap; va_list ap;
char *name = NULL; char *name = NULL;
int ret = -ENOMEM; int ret = -ENOMEM;
@ -194,13 +212,14 @@ int simple_util_set_dailink_name(struct device *dev,
dai_link->stream_name = name; dai_link->stream_name = name;
} }
return ret; return simple_ret(priv, ret);
} }
EXPORT_SYMBOL_GPL(simple_util_set_dailink_name); EXPORT_SYMBOL_GPL(simple_util_set_dailink_name);
int simple_util_parse_card_name(struct snd_soc_card *card, int simple_util_parse_card_name(struct simple_util_priv *priv,
char *prefix) char *prefix)
{ {
struct snd_soc_card *card = simple_priv_to_card(priv);
int ret; int ret;
if (!prefix) if (!prefix)
@ -214,13 +233,13 @@ int simple_util_parse_card_name(struct snd_soc_card *card,
snprintf(prop, sizeof(prop), "%sname", prefix); snprintf(prop, sizeof(prop), "%sname", prefix);
ret = snd_soc_of_parse_card_name(card, prop); ret = snd_soc_of_parse_card_name(card, prop);
if (ret < 0) if (ret < 0)
return ret; goto end;
} }
if (!card->name && card->dai_link) if (!card->name && card->dai_link)
card->name = card->dai_link->name; card->name = card->dai_link->name;
end:
return 0; return simple_ret(priv, ret);
} }
EXPORT_SYMBOL_GPL(simple_util_parse_card_name); EXPORT_SYMBOL_GPL(simple_util_parse_card_name);
@ -348,7 +367,8 @@ cpu_err:
break; break;
simple_clk_disable(dai); simple_clk_disable(dai);
} }
return ret;
return simple_ret(priv, ret);
} }
EXPORT_SYMBOL_GPL(simple_util_startup); EXPORT_SYMBOL_GPL(simple_util_startup);
@ -379,16 +399,19 @@ void simple_util_shutdown(struct snd_pcm_substream *substream)
} }
EXPORT_SYMBOL_GPL(simple_util_shutdown); EXPORT_SYMBOL_GPL(simple_util_shutdown);
static int simple_set_clk_rate(struct device *dev, static int simple_set_clk_rate(struct simple_util_priv *priv,
struct simple_util_dai *simple_dai, struct simple_util_dai *simple_dai,
unsigned long rate) unsigned long rate)
{ {
struct device *dev = simple_priv_to_dev(priv);
int ret = -EINVAL;
if (!simple_dai) if (!simple_dai)
return 0; return 0;
if (simple_dai->clk_fixed && rate != simple_dai->sysclk) { if (simple_dai->clk_fixed && rate != simple_dai->sysclk) {
dev_err(dev, "dai %s invalid clock rate %lu\n", simple_dai->name, rate); dev_err(dev, "dai %s invalid clock rate %lu\n", simple_dai->name, rate);
return -EINVAL; goto end;
} }
if (!simple_dai->clk) if (!simple_dai->clk)
@ -397,10 +420,13 @@ static int simple_set_clk_rate(struct device *dev,
if (clk_get_rate(simple_dai->clk) == rate) if (clk_get_rate(simple_dai->clk) == rate)
return 0; return 0;
return clk_set_rate(simple_dai->clk, rate); ret = clk_set_rate(simple_dai->clk, rate);
end:
return simple_ret(priv, ret);
} }
static int simple_set_tdm(struct snd_soc_dai *dai, static int simple_set_tdm(struct simple_util_priv *priv,
struct snd_soc_dai *dai,
struct simple_util_dai *simple_dai, struct simple_util_dai *simple_dai,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
@ -430,12 +456,8 @@ static int simple_set_tdm(struct snd_soc_dai *dai,
simple_dai->rx_slot_mask, simple_dai->rx_slot_mask,
slot_count, slot_count,
slot_width); slot_width);
if (ret && ret != -ENOTSUPP) {
dev_err(dai->dev, "simple-card: set_tdm_slot error: %d\n", ret);
return ret;
}
return 0; return simple_ret(priv, ret);
} }
int simple_util_hw_params(struct snd_pcm_substream *substream, int simple_util_hw_params(struct snd_pcm_substream *substream,
@ -457,15 +479,15 @@ int simple_util_hw_params(struct snd_pcm_substream *substream,
mclk = params_rate(params) * mclk_fs; mclk = params_rate(params) * mclk_fs;
for_each_prop_dai_codec(props, i, pdai) { for_each_prop_dai_codec(props, i, pdai) {
ret = simple_set_clk_rate(rtd->dev, pdai, mclk); ret = simple_set_clk_rate(priv, pdai, mclk);
if (ret < 0) if (ret < 0)
return ret; goto end;
} }
for_each_prop_dai_cpu(props, i, pdai) { for_each_prop_dai_cpu(props, i, pdai) {
ret = simple_set_clk_rate(rtd->dev, pdai, mclk); ret = simple_set_clk_rate(priv, pdai, mclk);
if (ret < 0) if (ret < 0)
return ret; goto end;
} }
/* Ensure sysclk is set on all components in case any /* Ensure sysclk is set on all components in case any
@ -476,39 +498,40 @@ int simple_util_hw_params(struct snd_pcm_substream *substream,
ret = snd_soc_component_set_sysclk(component, 0, 0, ret = snd_soc_component_set_sysclk(component, 0, 0,
mclk, SND_SOC_CLOCK_IN); mclk, SND_SOC_CLOCK_IN);
if (ret && ret != -ENOTSUPP) if (ret && ret != -ENOTSUPP)
return ret; goto end;
} }
for_each_rtd_codec_dais(rtd, i, sdai) { for_each_rtd_codec_dais(rtd, i, sdai) {
pdai = simple_props_to_dai_codec(props, i); pdai = simple_props_to_dai_codec(props, i);
ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, pdai->clk_direction); ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, pdai->clk_direction);
if (ret && ret != -ENOTSUPP) if (ret && ret != -ENOTSUPP)
return ret; goto end;
} }
for_each_rtd_cpu_dais(rtd, i, sdai) { for_each_rtd_cpu_dais(rtd, i, sdai) {
pdai = simple_props_to_dai_cpu(props, i); pdai = simple_props_to_dai_cpu(props, i);
ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, pdai->clk_direction); ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, pdai->clk_direction);
if (ret && ret != -ENOTSUPP) if (ret && ret != -ENOTSUPP)
return ret; goto end;
} }
} }
for_each_prop_dai_codec(props, i, pdai) { for_each_prop_dai_codec(props, i, pdai) {
sdai = snd_soc_rtd_to_codec(rtd, i); sdai = snd_soc_rtd_to_codec(rtd, i);
ret = simple_set_tdm(sdai, pdai, params); ret = simple_set_tdm(priv, sdai, pdai, params);
if (ret < 0) if (ret < 0)
return ret; goto end;
} }
for_each_prop_dai_cpu(props, i, pdai) { for_each_prop_dai_cpu(props, i, pdai) {
sdai = snd_soc_rtd_to_cpu(rtd, i); sdai = snd_soc_rtd_to_cpu(rtd, i);
ret = simple_set_tdm(sdai, pdai, params); ret = simple_set_tdm(priv, sdai, pdai, params);
if (ret < 0) if (ret < 0)
return ret; goto end;
} }
ret = 0;
return 0; end:
return simple_ret(priv, ret);
} }
EXPORT_SYMBOL_GPL(simple_util_hw_params); EXPORT_SYMBOL_GPL(simple_util_hw_params);
@ -536,7 +559,8 @@ int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
} }
EXPORT_SYMBOL_GPL(simple_util_be_hw_params_fixup); EXPORT_SYMBOL_GPL(simple_util_be_hw_params_fixup);
static int simple_init_dai(struct snd_soc_dai *dai, struct simple_util_dai *simple_dai) static int simple_init_dai(struct simple_util_priv *priv,
struct snd_soc_dai *dai, struct simple_util_dai *simple_dai)
{ {
int ret; int ret;
@ -548,7 +572,7 @@ static int simple_init_dai(struct snd_soc_dai *dai, struct simple_util_dai *simp
simple_dai->clk_direction); simple_dai->clk_direction);
if (ret && ret != -ENOTSUPP) { if (ret && ret != -ENOTSUPP) {
dev_err(dai->dev, "simple-card: set_sysclk error\n"); dev_err(dai->dev, "simple-card: set_sysclk error\n");
return ret; goto end;
} }
} }
@ -560,11 +584,12 @@ static int simple_init_dai(struct snd_soc_dai *dai, struct simple_util_dai *simp
simple_dai->slot_width); simple_dai->slot_width);
if (ret && ret != -ENOTSUPP) { if (ret && ret != -ENOTSUPP) {
dev_err(dai->dev, "simple-card: set_tdm_slot error\n"); dev_err(dai->dev, "simple-card: set_tdm_slot error\n");
return ret; goto end;
} }
} }
ret = 0;
return 0; end:
return simple_ret(priv, ret);
} }
static inline int simple_component_is_codec(struct snd_soc_component *component) static inline int simple_component_is_codec(struct snd_soc_component *component)
@ -572,7 +597,8 @@ static inline int simple_component_is_codec(struct snd_soc_component *component)
return component->driver->endianness; return component->driver->endianness;
} }
static int simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, static int simple_init_for_codec2codec(struct simple_util_priv *priv,
struct snd_soc_pcm_runtime *rtd,
struct simple_dai_props *dai_props) struct simple_dai_props *dai_props)
{ {
struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai_link *dai_link = rtd->dai_link;
@ -604,12 +630,13 @@ static int simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd,
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "simple-card: no valid dai_link params\n"); dev_err(rtd->dev, "simple-card: no valid dai_link params\n");
return ret; goto end;
} }
ret = -ENOMEM;
c2c_params = devm_kzalloc(rtd->dev, sizeof(*c2c_params), GFP_KERNEL); c2c_params = devm_kzalloc(rtd->dev, sizeof(*c2c_params), GFP_KERNEL);
if (!c2c_params) if (!c2c_params)
return -ENOMEM; goto end;
c2c_params->formats = hw.formats; c2c_params->formats = hw.formats;
c2c_params->rates = hw.rates; c2c_params->rates = hw.rates;
@ -621,7 +648,9 @@ static int simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd,
dai_link->c2c_params = c2c_params; dai_link->c2c_params = c2c_params;
dai_link->num_c2c_params = 1; dai_link->num_c2c_params = 1;
return 0; ret = 0;
end:
return simple_ret(priv, ret);
} }
int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd) int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd)
@ -632,21 +661,19 @@ int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd)
int i, ret; int i, ret;
for_each_prop_dai_codec(props, i, dai) { for_each_prop_dai_codec(props, i, dai) {
ret = simple_init_dai(snd_soc_rtd_to_codec(rtd, i), dai); ret = simple_init_dai(priv, snd_soc_rtd_to_codec(rtd, i), dai);
if (ret < 0) if (ret < 0)
return ret; goto end;
} }
for_each_prop_dai_cpu(props, i, dai) { for_each_prop_dai_cpu(props, i, dai) {
ret = simple_init_dai(snd_soc_rtd_to_cpu(rtd, i), dai); ret = simple_init_dai(priv, snd_soc_rtd_to_cpu(rtd, i), dai);
if (ret < 0) if (ret < 0)
return ret; goto end;
} }
ret = simple_init_for_codec2codec(rtd, props); ret = simple_init_for_codec2codec(priv, rtd, props);
if (ret < 0) end:
return ret; return simple_ret(priv, ret);
return 0;
} }
EXPORT_SYMBOL_GPL(simple_util_dai_init); EXPORT_SYMBOL_GPL(simple_util_dai_init);
@ -831,7 +858,7 @@ int simple_util_init_aux_jacks(struct simple_util_priv *priv, char *prefix)
priv->aux_jacks = devm_kcalloc(card->dev, num, priv->aux_jacks = devm_kcalloc(card->dev, num,
sizeof(struct snd_soc_jack), GFP_KERNEL); sizeof(struct snd_soc_jack), GFP_KERNEL);
if (!priv->aux_jacks) if (!priv->aux_jacks)
return -ENOMEM; return simple_ret(priv, -ENOMEM);
for_each_card_auxs(card, component) { for_each_card_auxs(card, component) {
char id[128]; char id[128];
@ -992,13 +1019,11 @@ int graph_util_card_probe(struct snd_soc_card *card)
ret = simple_util_init_hp(card, &priv->hp_jack, NULL); ret = simple_util_init_hp(card, &priv->hp_jack, NULL);
if (ret < 0) if (ret < 0)
return ret; goto end;
ret = simple_util_init_mic(card, &priv->mic_jack, NULL); ret = simple_util_init_mic(card, &priv->mic_jack, NULL);
if (ret < 0) end:
return ret; return simple_ret(priv, ret);
return 0;
} }
EXPORT_SYMBOL_GPL(graph_util_card_probe); EXPORT_SYMBOL_GPL(graph_util_card_probe);
@ -1074,9 +1099,10 @@ static int graph_get_dai_id(struct device_node *ep)
return id; return id;
} }
int graph_util_parse_dai(struct device *dev, struct device_node *ep, int graph_util_parse_dai(struct simple_util_priv *priv, struct device_node *ep,
struct snd_soc_dai_link_component *dlc, int *is_single_link) struct snd_soc_dai_link_component *dlc, int *is_single_link)
{ {
struct device *dev = simple_priv_to_dev(priv);
struct of_phandle_args args = {}; struct of_phandle_args args = {};
struct snd_soc_dai *dai; struct snd_soc_dai *dai;
int ret; int ret;
@ -1092,11 +1118,12 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep,
args.np = ep; args.np = ep;
dai = snd_soc_get_dai_via_args(&args); dai = snd_soc_get_dai_via_args(&args);
if (dai) { if (dai) {
ret = -ENOMEM;
dlc->of_node = node; dlc->of_node = node;
dlc->dai_name = snd_soc_dai_name_get(dai); dlc->dai_name = snd_soc_dai_name_get(dai);
dlc->dai_args = snd_soc_copy_dai_args(dev, &args); dlc->dai_args = snd_soc_copy_dai_args(dev, &args);
if (!dlc->dai_args) if (!dlc->dai_args)
return -ENOMEM; goto end;
goto parse_dai_end; goto parse_dai_end;
} }
@ -1127,13 +1154,14 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep,
*/ */
ret = snd_soc_get_dlc(&args, dlc); ret = snd_soc_get_dlc(&args, dlc);
if (ret < 0) if (ret < 0)
return ret; goto end;
parse_dai_end: parse_dai_end:
if (is_single_link) if (is_single_link)
*is_single_link = of_graph_get_endpoint_count(node) == 1; *is_single_link = of_graph_get_endpoint_count(node) == 1;
ret = 0;
return 0; end:
return simple_ret(priv, ret);
} }
EXPORT_SYMBOL_GPL(graph_util_parse_dai); EXPORT_SYMBOL_GPL(graph_util_parse_dai);

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

@ -223,7 +223,7 @@ static int simple_link_init(struct simple_util_priv *priv,
dai_link->init = simple_util_dai_init; dai_link->init = simple_util_dai_init;
dai_link->ops = &simple_ops; dai_link->ops = &simple_ops;
ret = simple_util_set_dailink_name(dev, dai_link, name); ret = simple_util_set_dailink_name(priv, dai_link, name);
end: end:
return simple_ret(priv, ret); return simple_ret(priv, ret);
} }
@ -544,7 +544,7 @@ static int simple_parse_of(struct simple_util_priv *priv, struct link_info *li)
if (ret < 0) if (ret < 0)
goto end; goto end;
ret = simple_util_parse_card_name(card, PREFIX); ret = simple_util_parse_card_name(priv, PREFIX);
if (ret < 0) if (ret < 0)
goto end; goto end;