Skip to content

L
linux
Commit b4b7de99 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: generic: convert not to use asoc_xxx() 

ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h6o0qnho.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1880a434
Hide whitespace changes
Inline Side-by-side
Showing with 263 additions and 265 deletions
sound/soc/generic/audio-graph-card.c
View file @ b4b7de99
...@@ -27,7 +27,7 @@ static int graph_outdrv_event(struct snd_soc_dapm_widget *w, ...@@ -27,7 +27,7 @@ static int graph_outdrv_event(struct snd_soc_dapm_widget *w,
int event) int event)
{ {
struct snd_soc_dapm_context *dapm = w->dapm; struct snd_soc_dapm_context *dapm = w->dapm;
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(dapm->card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(dapm->card);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
...@@ -50,9 +50,9 @@ static const struct snd_soc_dapm_widget graph_dapm_widgets[] = { ...@@ -50,9 +50,9 @@ static const struct snd_soc_dapm_widget graph_dapm_widgets[] = {
}; };
static const struct snd_soc_ops graph_ops = { static const struct snd_soc_ops graph_ops = {
.startup = asoc_simple_startup, .startup = simple_util_startup,
.shutdown = asoc_simple_shutdown, .shutdown = simple_util_shutdown,
.hw_params = asoc_simple_hw_params, .hw_params = simple_util_hw_params,
}; };
static bool soc_component_is_pcm(struct snd_soc_dai_link_component *dlc) static bool soc_component_is_pcm(struct snd_soc_dai_link_component *dlc)
...@@ -68,18 +68,18 @@ static bool soc_component_is_pcm(struct snd_soc_dai_link_component *dlc) ...@@ -68,18 +68,18 @@ static bool soc_component_is_pcm(struct snd_soc_dai_link_component *dlc)
static void graph_parse_convert(struct device *dev, static void graph_parse_convert(struct device *dev,
struct device_node *ep, struct device_node *ep,
struct asoc_simple_data *adata) struct simple_util_data *adata)
{ {
struct device_node *top = dev->of_node; struct device_node *top = dev->of_node;
struct device_node *port = of_get_parent(ep); struct device_node *port = of_get_parent(ep);
struct device_node *ports = of_get_parent(port); struct device_node *ports = of_get_parent(port);
struct device_node *node = of_graph_get_port_parent(ep); struct device_node *node = of_graph_get_port_parent(ep);
asoc_simple_parse_convert(top, NULL, adata); simple_util_parse_convert(top, NULL, adata);
if (of_node_name_eq(ports, "ports")) if (of_node_name_eq(ports, "ports"))
asoc_simple_parse_convert(ports, NULL, adata); simple_util_parse_convert(ports, NULL, adata);
asoc_simple_parse_convert(port, NULL, adata); simple_util_parse_convert(port, NULL, adata);
asoc_simple_parse_convert(ep, NULL, adata); simple_util_parse_convert(ep, NULL, adata);
of_node_put(port); of_node_put(port);
of_node_put(ports); of_node_put(ports);
...@@ -103,7 +103,7 @@ static void graph_parse_mclk_fs(struct device_node *top, ...@@ -103,7 +103,7 @@ static void graph_parse_mclk_fs(struct device_node *top,
of_node_put(ports); of_node_put(ports);
} }
static int graph_parse_node(struct asoc_simple_priv *priv, static int graph_parse_node(struct simple_util_priv *priv,
struct device_node *ep, struct device_node *ep,
struct link_info *li, struct link_info *li,
int *cpu) int *cpu)
...@@ -113,35 +113,35 @@ static int graph_parse_node(struct asoc_simple_priv *priv, ...@@ -113,35 +113,35 @@ static int graph_parse_node(struct asoc_simple_priv *priv,
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link);
struct snd_soc_dai_link_component *dlc; struct snd_soc_dai_link_component *dlc;
struct asoc_simple_dai *dai; struct simple_util_dai *dai;
int ret; int ret;
if (cpu) { if (cpu) {
dlc = asoc_link_to_cpu(dai_link, 0); dlc = snd_soc_link_to_cpu(dai_link, 0);
dai = simple_props_to_dai_cpu(dai_props, 0); dai = simple_props_to_dai_cpu(dai_props, 0);
} else { } else {
dlc = asoc_link_to_codec(dai_link, 0); dlc = snd_soc_link_to_codec(dai_link, 0);
dai = simple_props_to_dai_codec(dai_props, 0); dai = simple_props_to_dai_codec(dai_props, 0);
} }
graph_parse_mclk_fs(top, ep, dai_props); graph_parse_mclk_fs(top, ep, dai_props);
ret = asoc_graph_parse_dai(dev, ep, dlc, cpu); ret = graph_util_parse_dai(dev, ep, dlc, cpu);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_tdm(ep, dai); ret = simple_util_parse_tdm(ep, dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_clk(dev, ep, dai, dlc); ret = simple_util_parse_clk(dev, ep, dai, dlc);
if (ret < 0) if (ret < 0)
return ret; return ret;
return 0; return 0;
} }
static int graph_link_init(struct asoc_simple_priv *priv, static int graph_link_init(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li, struct link_info *li,
...@@ -151,20 +151,20 @@ static int graph_link_init(struct asoc_simple_priv *priv, ...@@ -151,20 +151,20 @@ static int graph_link_init(struct asoc_simple_priv *priv,
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
int ret; int ret;
ret = asoc_simple_parse_daifmt(dev, cpu_ep, codec_ep, ret = simple_util_parse_daifmt(dev, cpu_ep, codec_ep,
NULL, &dai_link->dai_fmt); NULL, &dai_link->dai_fmt);
if (ret < 0) if (ret < 0)
return ret; return ret;
dai_link->init = asoc_simple_dai_init; dai_link->init = simple_util_dai_init;
dai_link->ops = &graph_ops; dai_link->ops = &graph_ops;
if (priv->ops) if (priv->ops)
dai_link->ops = priv->ops; dai_link->ops = priv->ops;
return asoc_simple_set_dailink_name(dev, dai_link, name); return simple_util_set_dailink_name(dev, dai_link, name);
} }
static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, static int graph_dai_link_of_dpcm(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li) struct link_info *li)
...@@ -181,8 +181,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -181,8 +181,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
if (li->cpu) { if (li->cpu) {
struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_card *card = simple_priv_to_card(priv);
struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); struct snd_soc_dai_link_component *cpus = snd_soc_link_to_cpu(dai_link, 0);
struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0); struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, 0);
int is_single_links = 0; int is_single_links = 0;
/* Codec is dummy */ /* Codec is dummy */
...@@ -209,14 +209,14 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -209,14 +209,14 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
*/ */
if (card->component_chaining && !soc_component_is_pcm(cpus)) { if (card->component_chaining && !soc_component_is_pcm(cpus)) {
dai_link->no_pcm = 1; dai_link->no_pcm = 1;
dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup; dai_link->be_hw_params_fixup = simple_util_be_hw_params_fixup;
} }
asoc_simple_canonicalize_cpu(cpus, is_single_links); simple_util_canonicalize_cpu(cpus, is_single_links);
asoc_simple_canonicalize_platform(platforms, cpus); simple_util_canonicalize_platform(platforms, cpus);
} else { } else {
struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, 0); struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, 0);
struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, 0);
struct device_node *port; struct device_node *port;
struct device_node *ports; struct device_node *ports;
...@@ -224,7 +224,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -224,7 +224,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
/* BE settings */ /* BE settings */
dai_link->no_pcm = 1; dai_link->no_pcm = 1;
dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup; dai_link->be_hw_params_fixup = simple_util_be_hw_params_fixup;
ret = graph_parse_node(priv, codec_ep, li, NULL); ret = graph_parse_node(priv, codec_ep, li, NULL);
if (ret < 0) if (ret < 0)
...@@ -258,16 +258,16 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -258,16 +258,16 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv,
return ret; return ret;
} }
static int graph_dai_link_of(struct asoc_simple_priv *priv, static int graph_dai_link_of(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li) struct link_info *li)
{ {
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); struct snd_soc_dai_link_component *cpus = snd_soc_link_to_cpu(dai_link, 0);
struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, 0);
struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0); struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, 0);
char dai_name[64]; char dai_name[64];
int ret, is_single_links = 0; int ret, is_single_links = 0;
...@@ -284,8 +284,8 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv, ...@@ -284,8 +284,8 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv,
snprintf(dai_name, sizeof(dai_name), snprintf(dai_name, sizeof(dai_name),
"%s-%s", cpus->dai_name, codecs->dai_name); "%s-%s", cpus->dai_name, codecs->dai_name);
asoc_simple_canonicalize_cpu(cpus, is_single_links); simple_util_canonicalize_cpu(cpus, is_single_links);
asoc_simple_canonicalize_platform(platforms, cpus); simple_util_canonicalize_platform(platforms, cpus);
ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name); ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name);
if (ret < 0) if (ret < 0)
...@@ -296,9 +296,9 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv, ...@@ -296,9 +296,9 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static inline bool parse_as_dpcm_link(struct asoc_simple_priv *priv, static inline bool parse_as_dpcm_link(struct simple_util_priv *priv,
struct device_node *codec_port, struct device_node *codec_port,
struct asoc_simple_data *adata) struct simple_util_data *adata)
{ {
if (priv->force_dpcm) if (priv->force_dpcm)
return true; return true;
...@@ -312,19 +312,19 @@ static inline bool parse_as_dpcm_link(struct asoc_simple_priv *priv, ...@@ -312,19 +312,19 @@ static inline bool parse_as_dpcm_link(struct asoc_simple_priv *priv,
* or has convert-xxx property * or has convert-xxx property
*/ */
if ((of_get_child_count(codec_port) > 1) || if ((of_get_child_count(codec_port) > 1) ||
asoc_simple_is_convert_required(adata)) simple_util_is_convert_required(adata))
return true; return true;
return false; return false;
} }
static int __graph_for_each_link(struct asoc_simple_priv *priv, static int __graph_for_each_link(struct simple_util_priv *priv,
struct link_info *li, struct link_info *li,
int (*func_noml)(struct asoc_simple_priv *priv, int (*func_noml)(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li), struct link_info *li),
int (*func_dpcm)(struct asoc_simple_priv *priv, int (*func_dpcm)(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li)) struct link_info *li))
...@@ -337,7 +337,7 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv, ...@@ -337,7 +337,7 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv,
struct device_node *codec_ep; struct device_node *codec_ep;
struct device_node *codec_port; struct device_node *codec_port;
struct device_node *codec_port_old = NULL; struct device_node *codec_port_old = NULL;
struct asoc_simple_data adata; struct simple_util_data adata;
int rc, ret = 0; int rc, ret = 0;
/* loop for all listed CPU port */ /* loop for all listed CPU port */
...@@ -392,13 +392,13 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv, ...@@ -392,13 +392,13 @@ static int __graph_for_each_link(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static int graph_for_each_link(struct asoc_simple_priv *priv, static int graph_for_each_link(struct simple_util_priv *priv,
struct link_info *li, struct link_info *li,
int (*func_noml)(struct asoc_simple_priv *priv, int (*func_noml)(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li), struct link_info *li),
int (*func_dpcm)(struct asoc_simple_priv *priv, int (*func_dpcm)(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li)) struct link_info *li))
...@@ -425,7 +425,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, ...@@ -425,7 +425,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
return ret; return ret;
} }
static int graph_count_noml(struct asoc_simple_priv *priv, static int graph_count_noml(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li) struct link_info *li)
...@@ -454,7 +454,7 @@ static int graph_count_noml(struct asoc_simple_priv *priv, ...@@ -454,7 +454,7 @@ static int graph_count_noml(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static int graph_count_dpcm(struct asoc_simple_priv *priv, static int graph_count_dpcm(struct simple_util_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
struct device_node *codec_ep, struct device_node *codec_ep,
struct link_info *li) struct link_info *li)
...@@ -487,7 +487,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, ...@@ -487,7 +487,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static int graph_get_dais_count(struct asoc_simple_priv *priv, static int graph_get_dais_count(struct simple_util_priv *priv,
struct link_info *li) struct link_info *li)
{ {
/* /*
...@@ -541,7 +541,7 @@ static int graph_get_dais_count(struct asoc_simple_priv *priv, ...@@ -541,7 +541,7 @@ static int graph_get_dais_count(struct asoc_simple_priv *priv,
graph_count_dpcm); graph_count_dpcm);
} }
int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) int audio_graph_parse_of(struct simple_util_priv *priv, struct device *dev)
{ {
struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_card *card = simple_priv_to_card(priv);
struct link_info *li; struct link_info *li;
...@@ -561,7 +561,7 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) ...@@ -561,7 +561,7 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev)
if (!li->link) if (!li->link)
return -EINVAL; return -EINVAL;
ret = asoc_simple_init_priv(priv, li); ret = simple_util_init_priv(priv, li);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -572,11 +572,11 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) ...@@ -572,11 +572,11 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev)
return ret; return ret;
} }
ret = asoc_simple_parse_widgets(card, NULL); ret = simple_util_parse_widgets(card, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_routing(card, NULL); ret = simple_util_parse_routing(card, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -587,13 +587,13 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) ...@@ -587,13 +587,13 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev)
if (ret < 0) if (ret < 0)
goto err; goto err;
ret = asoc_simple_parse_card_name(card, NULL); ret = simple_util_parse_card_name(card, NULL);
if (ret < 0) if (ret < 0)
goto err; goto err;
snd_soc_card_set_drvdata(card, priv); snd_soc_card_set_drvdata(card, priv);
asoc_simple_debug_info(priv); simple_util_debug_info(priv);
ret = devm_snd_soc_register_card(dev, card); ret = devm_snd_soc_register_card(dev, card);
if (ret < 0) if (ret < 0)
...@@ -603,7 +603,7 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) ...@@ -603,7 +603,7 @@ int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev)
return 0; return 0;
err: err:
asoc_simple_clean_reference(card); simple_util_clean_reference(card);
return dev_err_probe(dev, ret, "parse error\n"); return dev_err_probe(dev, ret, "parse error\n");
} }
...@@ -611,7 +611,7 @@ EXPORT_SYMBOL_GPL(audio_graph_parse_of); ...@@ -611,7 +611,7 @@ EXPORT_SYMBOL_GPL(audio_graph_parse_of);
static int graph_probe(struct platform_device *pdev) static int graph_probe(struct platform_device *pdev)
{ {
struct asoc_simple_priv *priv; struct simple_util_priv *priv;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct snd_soc_card *card; struct snd_soc_card *card;
...@@ -623,7 +623,7 @@ static int graph_probe(struct platform_device *pdev) ...@@ -623,7 +623,7 @@ static int graph_probe(struct platform_device *pdev)
card = simple_priv_to_card(priv); card = simple_priv_to_card(priv);
card->dapm_widgets = graph_dapm_widgets; card->dapm_widgets = graph_dapm_widgets;
card->num_dapm_widgets = ARRAY_SIZE(graph_dapm_widgets); card->num_dapm_widgets = ARRAY_SIZE(graph_dapm_widgets);
card->probe = asoc_graph_card_probe; card->probe = graph_util_card_probe;
if (of_device_get_match_data(dev)) if (of_device_get_match_data(dev))
priv->dpcm_selectable = 1; priv->dpcm_selectable = 1;
...@@ -646,7 +646,7 @@ static struct platform_driver graph_card = { ...@@ -646,7 +646,7 @@ static struct platform_driver graph_card = {
.of_match_table = graph_of_match, .of_match_table = graph_of_match,
}, },
.probe = graph_probe, .probe = graph_probe,
.remove = asoc_simple_remove, .remove = simple_util_remove,
}; };
module_platform_driver(graph_card); module_platform_driver(graph_card);
......
sound/soc/generic/audio-graph-card2-custom-sample.c
View file @ b4b7de99
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
/* /*
* Custom driver can have own priv * Custom driver can have own priv
* which includes asoc_simple_priv. * which includes simple_util_priv.
*/ */
struct custom_priv { struct custom_priv {
struct asoc_simple_priv simple_priv; struct simple_util_priv simple_priv;
/* custom driver's own params */ /* custom driver's own params */
int custom_params; int custom_params;
...@@ -26,7 +26,7 @@ struct custom_priv { ...@@ -26,7 +26,7 @@ struct custom_priv {
static int custom_card_probe(struct snd_soc_card *card) static int custom_card_probe(struct snd_soc_card *card)
{ {
struct asoc_simple_priv *simple_priv = snd_soc_card_get_drvdata(card); struct simple_util_priv *simple_priv = snd_soc_card_get_drvdata(card);
struct custom_priv *custom_priv = simple_to_custom(simple_priv); struct custom_priv *custom_priv = simple_to_custom(simple_priv);
struct device *dev = simple_priv_to_dev(simple_priv); struct device *dev = simple_priv_to_dev(simple_priv);
...@@ -35,10 +35,10 @@ static int custom_card_probe(struct snd_soc_card *card) ...@@ -35,10 +35,10 @@ static int custom_card_probe(struct snd_soc_card *card)
custom_priv->custom_params = 1; custom_priv->custom_params = 1;
/* you can use generic probe function */ /* you can use generic probe function */
return asoc_graph_card_probe(card); return graph_util_card_probe(card);
} }
static int custom_hook_pre(struct asoc_simple_priv *priv) static int custom_hook_pre(struct simple_util_priv *priv)
{ {
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
...@@ -48,7 +48,7 @@ static int custom_hook_pre(struct asoc_simple_priv *priv) ...@@ -48,7 +48,7 @@ static int custom_hook_pre(struct asoc_simple_priv *priv)
return 0; return 0;
} }
static int custom_hook_post(struct asoc_simple_priv *priv) static int custom_hook_post(struct simple_util_priv *priv)
{ {
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
struct snd_soc_card *card; struct snd_soc_card *card;
...@@ -63,7 +63,7 @@ static int custom_hook_post(struct asoc_simple_priv *priv) ...@@ -63,7 +63,7 @@ static int custom_hook_post(struct asoc_simple_priv *priv)
return 0; return 0;
} }
static int custom_normal(struct asoc_simple_priv *priv, static int custom_normal(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -78,7 +78,7 @@ static int custom_normal(struct asoc_simple_priv *priv, ...@@ -78,7 +78,7 @@ static int custom_normal(struct asoc_simple_priv *priv,
return audio_graph2_link_normal(priv, lnk, li); return audio_graph2_link_normal(priv, lnk, li);
} }
static int custom_dpcm(struct asoc_simple_priv *priv, static int custom_dpcm(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -93,7 +93,7 @@ static int custom_dpcm(struct asoc_simple_priv *priv, ...@@ -93,7 +93,7 @@ static int custom_dpcm(struct asoc_simple_priv *priv,
return audio_graph2_link_dpcm(priv, lnk, li); return audio_graph2_link_dpcm(priv, lnk, li);
} }
static int custom_c2c(struct asoc_simple_priv *priv, static int custom_c2c(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -121,26 +121,26 @@ static struct graph2_custom_hooks custom_hooks = { ...@@ -121,26 +121,26 @@ static struct graph2_custom_hooks custom_hooks = {
static int custom_startup(struct snd_pcm_substream *substream) static int custom_startup(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
dev_info(dev, "custom startup\n"); dev_info(dev, "custom startup\n");
return asoc_simple_startup(substream); return simple_util_startup(substream);
} }
/* You can use custom ops */ /* You can use custom ops */
static const struct snd_soc_ops custom_ops = { static const struct snd_soc_ops custom_ops = {
.startup = custom_startup, .startup = custom_startup,
.shutdown = asoc_simple_shutdown, .shutdown = simple_util_shutdown,
.hw_params = asoc_simple_hw_params, .hw_params = simple_util_hw_params,
}; };
static int custom_probe(struct platform_device *pdev) static int custom_probe(struct platform_device *pdev)
{ {
struct custom_priv *custom_priv; struct custom_priv *custom_priv;
struct asoc_simple_priv *simple_priv; struct simple_util_priv *simple_priv;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int ret; int ret;
...@@ -176,7 +176,7 @@ static struct platform_driver custom_card = { ...@@ -176,7 +176,7 @@ static struct platform_driver custom_card = {
.of_match_table = custom_of_match, .of_match_table = custom_of_match,
}, },
.probe = custom_probe, .probe = custom_probe,
.remove = asoc_simple_remove, .remove = simple_util_remove,
}; };
module_platform_driver(custom_card); module_platform_driver(custom_card);
......
sound/soc/generic/audio-graph-card2.c
View file @ b4b7de99
...@@ -282,7 +282,7 @@ static enum graph_type __graph_get_type(struct device_node *lnk) ...@@ -282,7 +282,7 @@ static enum graph_type __graph_get_type(struct device_node *lnk)
} }
static enum graph_type graph_get_type(struct asoc_simple_priv *priv, static enum graph_type graph_get_type(struct simple_util_priv *priv,
struct device_node *lnk) struct device_node *lnk)
{ {
enum graph_type type = __graph_get_type(lnk); enum graph_type type = __graph_get_type(lnk);
...@@ -298,7 +298,7 @@ static enum graph_type graph_get_type(struct asoc_simple_priv *priv, ...@@ -298,7 +298,7 @@ static enum graph_type graph_get_type(struct asoc_simple_priv *priv,
switch (type) { switch (type) {
case GRAPH_DPCM: case GRAPH_DPCM:
if (asoc_graph_is_ports0(lnk)) if (graph_util_is_ports0(lnk))
str = "DPCM Front-End"; str = "DPCM Front-End";
else else
str = "DPCM Back-End"; str = "DPCM Back-End";
...@@ -360,9 +360,9 @@ static struct device_node *graph_get_next_multi_ep(struct device_node **port) ...@@ -360,9 +360,9 @@ static struct device_node *graph_get_next_multi_ep(struct device_node **port)
} }
static const struct snd_soc_ops graph_ops = { static const struct snd_soc_ops graph_ops = {
.startup = asoc_simple_startup, .startup = simple_util_startup,
.shutdown = asoc_simple_shutdown, .shutdown = simple_util_shutdown,
.hw_params = asoc_simple_hw_params, .hw_params = simple_util_hw_params,
}; };
static void graph_parse_convert(struct device_node *ep, static void graph_parse_convert(struct device_node *ep,
...@@ -370,12 +370,12 @@ static void graph_parse_convert(struct device_node *ep, ...@@ -370,12 +370,12 @@ static void graph_parse_convert(struct device_node *ep,
{ {
struct device_node *port = of_get_parent(ep); struct device_node *port = of_get_parent(ep);
struct device_node *ports = of_get_parent(port); struct device_node *ports = of_get_parent(port);
struct asoc_simple_data *adata = &props->adata; struct simple_util_data *adata = &props->adata;
if (of_node_name_eq(ports, "ports")) if (of_node_name_eq(ports, "ports"))
asoc_simple_parse_convert(ports, NULL, adata); simple_util_parse_convert(ports, NULL, adata);
asoc_simple_parse_convert(port, NULL, adata); simple_util_parse_convert(port, NULL, adata);
asoc_simple_parse_convert(ep, NULL, adata); simple_util_parse_convert(ep, NULL, adata);
of_node_put(port); of_node_put(port);
of_node_put(ports); of_node_put(ports);
...@@ -396,7 +396,7 @@ static void graph_parse_mclk_fs(struct device_node *ep, ...@@ -396,7 +396,7 @@ static void graph_parse_mclk_fs(struct device_node *ep,
of_node_put(ports); of_node_put(ports);
} }
static int __graph_parse_node(struct asoc_simple_priv *priv, static int __graph_parse_node(struct simple_util_priv *priv,
enum graph_type gtype, enum graph_type gtype,
struct device_node *ep, struct device_node *ep,
struct link_info *li, struct link_info *li,
...@@ -406,32 +406,32 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, ...@@ -406,32 +406,32 @@ static int __graph_parse_node(struct asoc_simple_priv *priv,
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link);
struct snd_soc_dai_link_component *dlc; struct snd_soc_dai_link_component *dlc;
struct asoc_simple_dai *dai; struct simple_util_dai *dai;
int ret, is_single_links = 0; int ret, is_single_links = 0;
if (is_cpu) { if (is_cpu) {
dlc = asoc_link_to_cpu(dai_link, idx); dlc = snd_soc_link_to_cpu(dai_link, idx);
dai = simple_props_to_dai_cpu(dai_props, idx); dai = simple_props_to_dai_cpu(dai_props, idx);
} else { } else {
dlc = asoc_link_to_codec(dai_link, idx); dlc = snd_soc_link_to_codec(dai_link, idx);
dai = simple_props_to_dai_codec(dai_props, idx); dai = simple_props_to_dai_codec(dai_props, idx);
} }
graph_parse_mclk_fs(ep, dai_props); graph_parse_mclk_fs(ep, dai_props);
ret = asoc_graph_parse_dai(dev, ep, dlc, &is_single_links); ret = graph_util_parse_dai(dev, ep, dlc, &is_single_links);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_tdm(ep, dai); ret = simple_util_parse_tdm(ep, dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_tdm_width_map(dev, ep, dai); ret = simple_util_parse_tdm_width_map(dev, ep, dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_clk(dev, ep, dai, dlc); ret = simple_util_parse_clk(dev, ep, dai, dlc);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -440,7 +440,7 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, ...@@ -440,7 +440,7 @@ static int __graph_parse_node(struct asoc_simple_priv *priv,
*/ */
if (!dai_link->name) { if (!dai_link->name) {
struct snd_soc_dai_link_component *cpus = dlc; struct snd_soc_dai_link_component *cpus = dlc;
struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, idx); struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, idx);
char *cpu_multi = ""; char *cpu_multi = "";
char *codec_multi = ""; char *codec_multi = "";
...@@ -453,22 +453,22 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, ...@@ -453,22 +453,22 @@ static int __graph_parse_node(struct asoc_simple_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)
asoc_simple_set_dailink_name(dev, dai_link, "%s%s-%s%s", simple_util_set_dailink_name(dev, 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)
asoc_simple_set_dailink_name(dev, dai_link, "fe.%pOFP.%s%s", simple_util_set_dailink_name(dev, dai_link, "fe.%pOFP.%s%s",
cpus->of_node, cpus->dai_name, cpu_multi); cpus->of_node, cpus->dai_name, cpu_multi);
else else
asoc_simple_set_dailink_name(dev, dai_link, "be.%pOFP.%s%s", simple_util_set_dailink_name(dev, 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)
asoc_simple_set_dailink_name(dev, dai_link, "c2c.%s%s-%s%s", simple_util_set_dailink_name(dev, 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;
...@@ -482,7 +482,7 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, ...@@ -482,7 +482,7 @@ static int __graph_parse_node(struct asoc_simple_priv *priv,
* if DPCM-BE case * if DPCM-BE case
*/ */
if (!is_cpu && gtype == GRAPH_DPCM) { if (!is_cpu && gtype == GRAPH_DPCM) {
struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, idx); struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, idx);
struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, idx); struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, idx);
struct device_node *rport = of_get_parent(ep); struct device_node *rport = of_get_parent(ep);
struct device_node *rports = of_get_parent(rport); struct device_node *rports = of_get_parent(rport);
...@@ -497,16 +497,16 @@ static int __graph_parse_node(struct asoc_simple_priv *priv, ...@@ -497,16 +497,16 @@ static int __graph_parse_node(struct asoc_simple_priv *priv,
if (is_cpu) { if (is_cpu) {
struct snd_soc_dai_link_component *cpus = dlc; struct snd_soc_dai_link_component *cpus = dlc;
struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, idx); struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, idx);
asoc_simple_canonicalize_cpu(cpus, is_single_links); simple_util_canonicalize_cpu(cpus, is_single_links);
asoc_simple_canonicalize_platform(platforms, cpus); simple_util_canonicalize_platform(platforms, cpus);
} }
return 0; return 0;
} }
static int graph_parse_node(struct asoc_simple_priv *priv, static int graph_parse_node(struct simple_util_priv *priv,
enum graph_type gtype, enum graph_type gtype,
struct device_node *port, struct device_node *port,
struct link_info *li, int is_cpu) struct link_info *li, int is_cpu)
...@@ -590,7 +590,7 @@ static void graph_parse_daifmt(struct device_node *node, ...@@ -590,7 +590,7 @@ static void graph_parse_daifmt(struct device_node *node,
update_daifmt(INV); update_daifmt(INV);
} }
static void graph_link_init(struct asoc_simple_priv *priv, static void graph_link_init(struct simple_util_priv *priv,
struct device_node *port, struct device_node *port,
struct link_info *li, struct link_info *li,
int is_cpu_node) int is_cpu_node)
...@@ -638,13 +638,13 @@ static void graph_link_init(struct asoc_simple_priv *priv, ...@@ -638,13 +638,13 @@ static void graph_link_init(struct asoc_simple_priv *priv,
daiclk = snd_soc_daifmt_clock_provider_flipped(daiclk); daiclk = snd_soc_daifmt_clock_provider_flipped(daiclk);
dai_link->dai_fmt = daifmt | daiclk; dai_link->dai_fmt = daifmt | daiclk;
dai_link->init = asoc_simple_dai_init; dai_link->init = simple_util_dai_init;
dai_link->ops = &graph_ops; dai_link->ops = &graph_ops;
if (priv->ops) if (priv->ops)
dai_link->ops = priv->ops; dai_link->ops = priv->ops;
} }
int audio_graph2_link_normal(struct asoc_simple_priv *priv, int audio_graph2_link_normal(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -678,7 +678,7 @@ int audio_graph2_link_normal(struct asoc_simple_priv *priv, ...@@ -678,7 +678,7 @@ int audio_graph2_link_normal(struct asoc_simple_priv *priv,
} }
EXPORT_SYMBOL_GPL(audio_graph2_link_normal); EXPORT_SYMBOL_GPL(audio_graph2_link_normal);
int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, int audio_graph2_link_dpcm(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -687,7 +687,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, ...@@ -687,7 +687,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv,
struct device_node *rport = of_graph_get_remote_port(ep); struct device_node *rport = of_graph_get_remote_port(ep);
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link);
int is_cpu = asoc_graph_is_ports0(lnk); int is_cpu = graph_util_is_ports0(lnk);
int ret; int ret;
if (is_cpu) { if (is_cpu) {
...@@ -713,7 +713,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, ...@@ -713,7 +713,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv,
/* /*
* setup CPU here, Codec is already set as dummy. * setup CPU here, Codec is already set as dummy.
* see * see
* asoc_simple_init_priv() * simple_util_init_priv()
*/ */
dai_link->dynamic = 1; dai_link->dynamic = 1;
dai_link->dpcm_merged_format = 1; dai_link->dpcm_merged_format = 1;
...@@ -744,12 +744,12 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, ...@@ -744,12 +744,12 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv,
/* /*
* setup Codec here, CPU is already set as dummy. * setup Codec here, CPU is already set as dummy.
* see * see
* asoc_simple_init_priv() * simple_util_init_priv()
*/ */
/* BE settings */ /* BE settings */
dai_link->no_pcm = 1; dai_link->no_pcm = 1;
dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup; dai_link->be_hw_params_fixup = simple_util_be_hw_params_fixup;
ret = graph_parse_node(priv, GRAPH_DPCM, rport, li, 0); ret = graph_parse_node(priv, GRAPH_DPCM, rport, li, 0);
if (ret < 0) if (ret < 0)
...@@ -771,7 +771,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv, ...@@ -771,7 +771,7 @@ int audio_graph2_link_dpcm(struct asoc_simple_priv *priv,
} }
EXPORT_SYMBOL_GPL(audio_graph2_link_dpcm); EXPORT_SYMBOL_GPL(audio_graph2_link_dpcm);
int audio_graph2_link_c2c(struct asoc_simple_priv *priv, int audio_graph2_link_c2c(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -807,7 +807,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, ...@@ -807,7 +807,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv,
* Card2 can use original Codec2Codec settings if DT has. * Card2 can use original Codec2Codec settings if DT has.
* It will use default settings if no settings on DT. * It will use default settings if no settings on DT.
* see * see
* asoc_simple_init_for_codec2codec() * simple_util_init_for_codec2codec()
* *
* Add more settings here if needed * Add more settings here if needed
*/ */
...@@ -868,7 +868,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, ...@@ -868,7 +868,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv,
} }
EXPORT_SYMBOL_GPL(audio_graph2_link_c2c); EXPORT_SYMBOL_GPL(audio_graph2_link_c2c);
static int graph_link(struct asoc_simple_priv *priv, static int graph_link(struct simple_util_priv *priv,
struct graph2_custom_hooks *hooks, struct graph2_custom_hooks *hooks,
enum graph_type gtype, enum graph_type gtype,
struct device_node *lnk, struct device_node *lnk,
...@@ -940,7 +940,7 @@ static int graph_counter(struct device_node *lnk) ...@@ -940,7 +940,7 @@ static int graph_counter(struct device_node *lnk)
return 1; return 1;
} }
static int graph_count_normal(struct asoc_simple_priv *priv, static int graph_count_normal(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -969,7 +969,7 @@ static int graph_count_normal(struct asoc_simple_priv *priv, ...@@ -969,7 +969,7 @@ static int graph_count_normal(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static int graph_count_dpcm(struct asoc_simple_priv *priv, static int graph_count_dpcm(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -991,7 +991,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, ...@@ -991,7 +991,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv,
* }; * };
*/ */
if (asoc_graph_is_ports0(lnk)) { if (graph_util_is_ports0(lnk)) {
/* /*
* DON'T REMOVE platforms * DON'T REMOVE platforms
* see * see
...@@ -1009,7 +1009,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv, ...@@ -1009,7 +1009,7 @@ static int graph_count_dpcm(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static int graph_count_c2c(struct asoc_simple_priv *priv, static int graph_count_c2c(struct simple_util_priv *priv,
struct device_node *lnk, struct device_node *lnk,
struct link_info *li) struct link_info *li)
{ {
...@@ -1051,7 +1051,7 @@ static int graph_count_c2c(struct asoc_simple_priv *priv, ...@@ -1051,7 +1051,7 @@ static int graph_count_c2c(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static int graph_count(struct asoc_simple_priv *priv, static int graph_count(struct simple_util_priv *priv,
struct graph2_custom_hooks *hooks, struct graph2_custom_hooks *hooks,
enum graph_type gtype, enum graph_type gtype,
struct device_node *lnk, struct device_node *lnk,
...@@ -1094,10 +1094,10 @@ static int graph_count(struct asoc_simple_priv *priv, ...@@ -1094,10 +1094,10 @@ static int graph_count(struct asoc_simple_priv *priv,
return ret; return ret;
} }
static int graph_for_each_link(struct asoc_simple_priv *priv, static int graph_for_each_link(struct simple_util_priv *priv,
struct graph2_custom_hooks *hooks, struct graph2_custom_hooks *hooks,
struct link_info *li, struct link_info *li,
int (*func)(struct asoc_simple_priv *priv, int (*func)(struct simple_util_priv *priv,
struct graph2_custom_hooks *hooks, struct graph2_custom_hooks *hooks,
enum graph_type gtype, enum graph_type gtype,
struct device_node *lnk, struct device_node *lnk,
...@@ -1124,7 +1124,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, ...@@ -1124,7 +1124,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
return 0; return 0;
} }
int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, int audio_graph2_parse_of(struct simple_util_priv *priv, struct device *dev,
struct graph2_custom_hooks *hooks) struct graph2_custom_hooks *hooks)
{ {
struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_card *card = simple_priv_to_card(priv);
...@@ -1135,7 +1135,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, ...@@ -1135,7 +1135,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev,
if (!li) if (!li)
return -ENOMEM; return -ENOMEM;
card->probe = asoc_graph_card_probe; card->probe = graph_util_card_probe;
card->owner = THIS_MODULE; card->owner = THIS_MODULE;
card->dev = dev; card->dev = dev;
...@@ -1151,7 +1151,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, ...@@ -1151,7 +1151,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev,
if (ret < 0) if (ret < 0)
goto err; goto err;
ret = asoc_simple_init_priv(priv, li); ret = simple_util_init_priv(priv, li);
if (ret < 0) if (ret < 0)
goto err; goto err;
...@@ -1162,11 +1162,11 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, ...@@ -1162,11 +1162,11 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev,
goto err; goto err;
} }
ret = asoc_simple_parse_widgets(card, NULL); ret = simple_util_parse_widgets(card, NULL);
if (ret < 0) if (ret < 0)
goto err; goto err;
ret = asoc_simple_parse_routing(card, NULL); ret = simple_util_parse_routing(card, NULL);
if (ret < 0) if (ret < 0)
goto err; goto err;
...@@ -1175,7 +1175,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, ...@@ -1175,7 +1175,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev,
if (ret < 0) if (ret < 0)
goto err; goto err;
ret = asoc_simple_parse_card_name(card, NULL); ret = simple_util_parse_card_name(card, NULL);
if (ret < 0) if (ret < 0)
goto err; goto err;
...@@ -1187,7 +1187,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev, ...@@ -1187,7 +1187,7 @@ int audio_graph2_parse_of(struct asoc_simple_priv *priv, struct device *dev,
goto err; goto err;
} }
asoc_simple_debug_info(priv); simple_util_debug_info(priv);
ret = devm_snd_soc_register_card(dev, card); ret = devm_snd_soc_register_card(dev, card);
err: err:
...@@ -1202,7 +1202,7 @@ EXPORT_SYMBOL_GPL(audio_graph2_parse_of); ...@@ -1202,7 +1202,7 @@ EXPORT_SYMBOL_GPL(audio_graph2_parse_of);
static int graph_probe(struct platform_device *pdev) static int graph_probe(struct platform_device *pdev)
{ {
struct asoc_simple_priv *priv; struct simple_util_priv *priv;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
/* Allocate the private data and the DAI link array */ /* Allocate the private data and the DAI link array */
...@@ -1226,7 +1226,7 @@ static struct platform_driver graph_card = { ...@@ -1226,7 +1226,7 @@ static struct platform_driver graph_card = {
.of_match_table = graph_of_match, .of_match_table = graph_of_match,
}, },
.probe = graph_probe, .probe = graph_probe,
.remove = asoc_simple_remove, .remove = simple_util_remove,
}; };
module_platform_driver(graph_card); module_platform_driver(graph_card);
......
sound/soc/generic/simple-card-utils.c
View file @ b4b7de99
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/simple_card_utils.h> #include <sound/simple_card_utils.h>
static void asoc_simple_fixup_sample_fmt(struct asoc_simple_data *data, static void simple_fixup_sample_fmt(struct simple_util_data *data,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
int i; int i;
...@@ -43,7 +43,7 @@ static void asoc_simple_fixup_sample_fmt(struct asoc_simple_data *data, ...@@ -43,7 +43,7 @@ static void asoc_simple_fixup_sample_fmt(struct asoc_simple_data *data,
void simple_util_parse_convert(struct device_node *np, void simple_util_parse_convert(struct device_node *np,
char *prefix, char *prefix,
struct asoc_simple_data *data) struct simple_util_data *data)
{ {
char prop[128]; char prop[128];
...@@ -65,13 +65,13 @@ void simple_util_parse_convert(struct device_node *np, ...@@ -65,13 +65,13 @@ void simple_util_parse_convert(struct device_node *np,
EXPORT_SYMBOL_GPL(simple_util_parse_convert); EXPORT_SYMBOL_GPL(simple_util_parse_convert);
/** /**
* asoc_simple_is_convert_required() - Query if HW param conversion was requested * simple_util_is_convert_required() - Query if HW param conversion was requested
* @data: Link data. * @data: Link data.
* *
* Returns true if any HW param conversion was requested for this DAI link with * Returns true if any HW param conversion was requested for this DAI link with
* any "convert-xxx" properties. * any "convert-xxx" properties.
*/ */
bool simple_util_is_convert_required(const struct asoc_simple_data *data) bool simple_util_is_convert_required(const struct simple_util_data *data)
{ {
return data->convert_rate || return data->convert_rate ||
data->convert_channels || data->convert_channels ||
...@@ -116,7 +116,7 @@ int simple_util_parse_daifmt(struct device *dev, ...@@ -116,7 +116,7 @@ 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 device *dev, struct device_node *np,
struct asoc_simple_dai *dai) struct simple_util_dai *dai)
{ {
u32 *array_values, *p; u32 *array_values, *p;
int n, i, ret; int n, i, ret;
...@@ -209,7 +209,7 @@ int simple_util_parse_card_name(struct snd_soc_card *card, ...@@ -209,7 +209,7 @@ int simple_util_parse_card_name(struct snd_soc_card *card,
} }
EXPORT_SYMBOL_GPL(simple_util_parse_card_name); EXPORT_SYMBOL_GPL(simple_util_parse_card_name);
static int asoc_simple_clk_enable(struct asoc_simple_dai *dai) static int simple_clk_enable(struct simple_util_dai *dai)
{ {
if (dai) if (dai)
return clk_prepare_enable(dai->clk); return clk_prepare_enable(dai->clk);
...@@ -217,7 +217,7 @@ static int asoc_simple_clk_enable(struct asoc_simple_dai *dai) ...@@ -217,7 +217,7 @@ static int asoc_simple_clk_enable(struct asoc_simple_dai *dai)
return 0; return 0;
} }
static void asoc_simple_clk_disable(struct asoc_simple_dai *dai) static void simple_clk_disable(struct simple_util_dai *dai)
{ {
if (dai) if (dai)
clk_disable_unprepare(dai->clk); clk_disable_unprepare(dai->clk);
...@@ -225,7 +225,7 @@ static void asoc_simple_clk_disable(struct asoc_simple_dai *dai) ...@@ -225,7 +225,7 @@ static void asoc_simple_clk_disable(struct asoc_simple_dai *dai)
int simple_util_parse_clk(struct device *dev, int simple_util_parse_clk(struct device *dev,
struct device_node *node, struct device_node *node,
struct asoc_simple_dai *simple_dai, struct simple_util_dai *simple_dai,
struct snd_soc_dai_link_component *dlc) struct snd_soc_dai_link_component *dlc)
{ {
struct clk *clk; struct clk *clk;
...@@ -260,8 +260,8 @@ int simple_util_parse_clk(struct device *dev, ...@@ -260,8 +260,8 @@ int simple_util_parse_clk(struct device *dev,
} }
EXPORT_SYMBOL_GPL(simple_util_parse_clk); EXPORT_SYMBOL_GPL(simple_util_parse_clk);
static int asoc_simple_check_fixed_sysclk(struct device *dev, static int simple_check_fixed_sysclk(struct device *dev,
struct asoc_simple_dai *dai, struct simple_util_dai *dai,
unsigned int *fixed_sysclk) unsigned int *fixed_sysclk)
{ {
if (dai->clk_fixed) { if (dai->clk_fixed) {
...@@ -278,28 +278,28 @@ static int asoc_simple_check_fixed_sysclk(struct device *dev, ...@@ -278,28 +278,28 @@ static int asoc_simple_check_fixed_sysclk(struct device *dev,
int simple_util_startup(struct snd_pcm_substream *substream) int simple_util_startup(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);
struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num);
struct asoc_simple_dai *dai; struct simple_util_dai *dai;
unsigned int fixed_sysclk = 0; unsigned int fixed_sysclk = 0;
int i1, i2, i; int i1, i2, i;
int ret; int ret;
for_each_prop_dai_cpu(props, i1, dai) { for_each_prop_dai_cpu(props, i1, dai) {
ret = asoc_simple_clk_enable(dai); ret = simple_clk_enable(dai);
if (ret) if (ret)
goto cpu_err; goto cpu_err;
ret = asoc_simple_check_fixed_sysclk(rtd->dev, dai, &fixed_sysclk); ret = simple_check_fixed_sysclk(rtd->dev, dai, &fixed_sysclk);
if (ret) if (ret)
goto cpu_err; goto cpu_err;
} }
for_each_prop_dai_codec(props, i2, dai) { for_each_prop_dai_codec(props, i2, dai) {
ret = asoc_simple_clk_enable(dai); ret = simple_clk_enable(dai);
if (ret) if (ret)
goto codec_err; goto codec_err;
ret = asoc_simple_check_fixed_sysclk(rtd->dev, dai, &fixed_sysclk); ret = simple_check_fixed_sysclk(rtd->dev, dai, &fixed_sysclk);
if (ret) if (ret)
goto codec_err; goto codec_err;
} }
...@@ -324,13 +324,13 @@ int simple_util_startup(struct snd_pcm_substream *substream) ...@@ -324,13 +324,13 @@ int simple_util_startup(struct snd_pcm_substream *substream)
for_each_prop_dai_codec(props, i, dai) { for_each_prop_dai_codec(props, i, dai) {
if (i >= i2) if (i >= i2)
break; break;
asoc_simple_clk_disable(dai); simple_clk_disable(dai);
} }
cpu_err: cpu_err:
for_each_prop_dai_cpu(props, i, dai) { for_each_prop_dai_cpu(props, i, dai) {
if (i >= i1) if (i >= i1)
break; break;
asoc_simple_clk_disable(dai); simple_clk_disable(dai);
} }
return ret; return ret;
} }
...@@ -338,35 +338,35 @@ EXPORT_SYMBOL_GPL(simple_util_startup); ...@@ -338,35 +338,35 @@ EXPORT_SYMBOL_GPL(simple_util_startup);
void simple_util_shutdown(struct snd_pcm_substream *substream) void simple_util_shutdown(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);
struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num);
struct asoc_simple_dai *dai; struct simple_util_dai *dai;
int i; int i;
for_each_prop_dai_cpu(props, i, dai) { for_each_prop_dai_cpu(props, i, dai) {
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, i); struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, i);
if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(cpu_dai)) if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(cpu_dai))
snd_soc_dai_set_sysclk(cpu_dai, snd_soc_dai_set_sysclk(cpu_dai,
0, 0, SND_SOC_CLOCK_OUT); 0, 0, SND_SOC_CLOCK_OUT);
asoc_simple_clk_disable(dai); simple_clk_disable(dai);
} }
for_each_prop_dai_codec(props, i, dai) { for_each_prop_dai_codec(props, i, dai) {
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, i); struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, i);
if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(codec_dai)) if (props->mclk_fs && !dai->clk_fixed && !snd_soc_dai_active(codec_dai))
snd_soc_dai_set_sysclk(codec_dai, snd_soc_dai_set_sysclk(codec_dai,
0, 0, SND_SOC_CLOCK_IN); 0, 0, SND_SOC_CLOCK_IN);
asoc_simple_clk_disable(dai); simple_clk_disable(dai);
} }
} }
EXPORT_SYMBOL_GPL(simple_util_shutdown); EXPORT_SYMBOL_GPL(simple_util_shutdown);
static int asoc_simple_set_clk_rate(struct device *dev, static int simple_set_clk_rate(struct device *dev,
struct asoc_simple_dai *simple_dai, struct simple_util_dai *simple_dai,
unsigned long rate) unsigned long rate)
{ {
if (!simple_dai) if (!simple_dai)
...@@ -386,8 +386,8 @@ static int asoc_simple_set_clk_rate(struct device *dev, ...@@ -386,8 +386,8 @@ static int asoc_simple_set_clk_rate(struct device *dev,
return clk_set_rate(simple_dai->clk, rate); return clk_set_rate(simple_dai->clk, rate);
} }
static int asoc_simple_set_tdm(struct snd_soc_dai *dai, static int simple_set_tdm(struct snd_soc_dai *dai,
struct asoc_simple_dai *simple_dai, struct simple_util_dai *simple_dai,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
int sample_bits = params_width(params); int sample_bits = params_width(params);
...@@ -427,10 +427,10 @@ static int asoc_simple_set_tdm(struct snd_soc_dai *dai, ...@@ -427,10 +427,10 @@ static int asoc_simple_set_tdm(struct snd_soc_dai *dai,
int simple_util_hw_params(struct snd_pcm_substream *substream, int simple_util_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct asoc_simple_dai *pdai; struct simple_util_dai *pdai;
struct snd_soc_dai *sdai; struct snd_soc_dai *sdai;
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);
struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num);
unsigned int mclk, mclk_fs = 0; unsigned int mclk, mclk_fs = 0;
int i, ret; int i, ret;
...@@ -443,13 +443,13 @@ int simple_util_hw_params(struct snd_pcm_substream *substream, ...@@ -443,13 +443,13 @@ 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 = asoc_simple_set_clk_rate(rtd->dev, pdai, mclk); ret = simple_set_clk_rate(rtd->dev, pdai, mclk);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
for_each_prop_dai_cpu(props, i, pdai) { for_each_prop_dai_cpu(props, i, pdai) {
ret = asoc_simple_set_clk_rate(rtd->dev, pdai, mclk); ret = simple_set_clk_rate(rtd->dev, pdai, mclk);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
...@@ -479,15 +479,15 @@ int simple_util_hw_params(struct snd_pcm_substream *substream, ...@@ -479,15 +479,15 @@ int simple_util_hw_params(struct snd_pcm_substream *substream,
} }
for_each_prop_dai_codec(props, i, pdai) { for_each_prop_dai_codec(props, i, pdai) {
sdai = asoc_rtd_to_codec(rtd, i); sdai = snd_soc_rtd_to_codec(rtd, i);
ret = asoc_simple_set_tdm(sdai, pdai, params); ret = simple_set_tdm(sdai, pdai, params);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
for_each_prop_dai_cpu(props, i, pdai) { for_each_prop_dai_cpu(props, i, pdai) {
sdai = asoc_rtd_to_cpu(rtd, i); sdai = snd_soc_rtd_to_cpu(rtd, i);
ret = asoc_simple_set_tdm(sdai, pdai, params); ret = simple_set_tdm(sdai, pdai, params);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
...@@ -499,9 +499,9 @@ EXPORT_SYMBOL_GPL(simple_util_hw_params); ...@@ -499,9 +499,9 @@ EXPORT_SYMBOL_GPL(simple_util_hw_params);
int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);
struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
struct asoc_simple_data *data = &dai_props->adata; struct simple_util_data *data = &dai_props->adata;
struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
...@@ -514,14 +514,13 @@ int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -514,14 +514,13 @@ int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
channels->max = data->convert_channels; channels->max = data->convert_channels;
if (data->convert_sample_format) if (data->convert_sample_format)
asoc_simple_fixup_sample_fmt(data, params); simple_fixup_sample_fmt(data, params);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(simple_util_be_hw_params_fixup); EXPORT_SYMBOL_GPL(simple_util_be_hw_params_fixup);
static int asoc_simple_init_dai(struct snd_soc_dai *dai, static int simple_init_dai(struct snd_soc_dai *dai, struct simple_util_dai *simple_dai)
struct asoc_simple_dai *simple_dai)
{ {
int ret; int ret;
...@@ -552,13 +551,13 @@ static int asoc_simple_init_dai(struct snd_soc_dai *dai, ...@@ -552,13 +551,13 @@ static int asoc_simple_init_dai(struct snd_soc_dai *dai,
return 0; return 0;
} }
static inline int asoc_simple_component_is_codec(struct snd_soc_component *component) static inline int simple_component_is_codec(struct snd_soc_component *component)
{ {
return component->driver->endianness; return component->driver->endianness;
} }
static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, static int simple_init_for_codec2codec(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;
struct snd_soc_component *component; struct snd_soc_component *component;
...@@ -576,7 +575,7 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, ...@@ -576,7 +575,7 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd,
/* Only Codecs */ /* Only Codecs */
for_each_rtd_components(rtd, i, component) { for_each_rtd_components(rtd, i, component) {
if (!asoc_simple_component_is_codec(component)) if (!simple_component_is_codec(component))
return 0; return 0;
} }
...@@ -611,23 +610,23 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, ...@@ -611,23 +610,23 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd,
int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd) int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);
struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num); struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num);
struct asoc_simple_dai *dai; struct simple_util_dai *dai;
int i, ret; int i, ret;
for_each_prop_dai_codec(props, i, dai) { for_each_prop_dai_codec(props, i, dai) {
ret = asoc_simple_init_dai(asoc_rtd_to_codec(rtd, i), dai); ret = simple_init_dai(snd_soc_rtd_to_codec(rtd, i), dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
for_each_prop_dai_cpu(props, i, dai) { for_each_prop_dai_cpu(props, i, dai) {
ret = asoc_simple_init_dai(asoc_rtd_to_cpu(rtd, i), dai); ret = simple_init_dai(snd_soc_rtd_to_cpu(rtd, i), dai);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
ret = asoc_simple_init_for_codec2codec(rtd, props); ret = simple_init_for_codec2codec(rtd, props);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -738,7 +737,7 @@ int simple_util_parse_pin_switches(struct snd_soc_card *card, ...@@ -738,7 +737,7 @@ int simple_util_parse_pin_switches(struct snd_soc_card *card,
EXPORT_SYMBOL_GPL(simple_util_parse_pin_switches); EXPORT_SYMBOL_GPL(simple_util_parse_pin_switches);
int simple_util_init_jack(struct snd_soc_card *card, int simple_util_init_jack(struct snd_soc_card *card,
struct asoc_simple_jack *sjack, struct simple_util_jack *sjack,
int is_hp, char *prefix, int is_hp, char *prefix,
char *pin) char *pin)
{ {
...@@ -795,7 +794,7 @@ int simple_util_init_jack(struct snd_soc_card *card, ...@@ -795,7 +794,7 @@ int simple_util_init_jack(struct snd_soc_card *card,
} }
EXPORT_SYMBOL_GPL(simple_util_init_jack); EXPORT_SYMBOL_GPL(simple_util_init_jack);
int simple_util_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) int simple_util_init_aux_jacks(struct simple_util_priv *priv, char *prefix)
{ {
struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_card *card = simple_priv_to_card(priv);
struct snd_soc_component *component; struct snd_soc_component *component;
...@@ -844,14 +843,14 @@ int simple_util_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix) ...@@ -844,14 +843,14 @@ int simple_util_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix)
} }
EXPORT_SYMBOL_GPL(simple_util_init_aux_jacks); EXPORT_SYMBOL_GPL(simple_util_init_aux_jacks);
int simple_util_init_priv(struct asoc_simple_priv *priv, int simple_util_init_priv(struct simple_util_priv *priv,
struct link_info *li) struct link_info *li)
{ {
struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_card *card = simple_priv_to_card(priv);
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
struct simple_dai_props *dai_props; struct simple_dai_props *dai_props;
struct asoc_simple_dai *dais; struct simple_util_dai *dais;
struct snd_soc_dai_link_component *dlcs; struct snd_soc_dai_link_component *dlcs;
struct snd_soc_codec_conf *cconf = NULL; struct snd_soc_codec_conf *cconf = NULL;
int i, dai_num = 0, dlc_num = 0, cnf_num = 0; int i, dai_num = 0, dlc_num = 0, cnf_num = 0;
...@@ -912,7 +911,7 @@ int simple_util_init_priv(struct asoc_simple_priv *priv, ...@@ -912,7 +911,7 @@ int simple_util_init_priv(struct asoc_simple_priv *priv,
dais += li->num[i].cpus; dais += li->num[i].cpus;
} else { } else {
/* DPCM Be's CPU = dummy */ /* DPCM Be's CPU = dummy */
dai_link[i].cpus = &asoc_dummy_dlc; dai_link[i].cpus = &snd_soc_dummy_dlc;
dai_props[i].num.cpus = dai_props[i].num.cpus =
dai_link[i].num_cpus = 1; dai_link[i].num_cpus = 1;
} }
...@@ -934,7 +933,7 @@ int simple_util_init_priv(struct asoc_simple_priv *priv, ...@@ -934,7 +933,7 @@ int simple_util_init_priv(struct asoc_simple_priv *priv,
} }
} else { } else {
/* DPCM Fe's Codec = dummy */ /* DPCM Fe's Codec = dummy */
dai_link[i].codecs = &asoc_dummy_dlc; dai_link[i].codecs = &snd_soc_dummy_dlc;
dai_props[i].num.codecs = dai_props[i].num.codecs =
dai_link[i].num_codecs = 1; dai_link[i].num_codecs = 1;
} }
...@@ -962,7 +961,7 @@ int simple_util_remove(struct platform_device *pdev) ...@@ -962,7 +961,7 @@ int simple_util_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
asoc_simple_clean_reference(card); simple_util_clean_reference(card);
return 0; return 0;
} }
...@@ -970,14 +969,14 @@ EXPORT_SYMBOL_GPL(simple_util_remove); ...@@ -970,14 +969,14 @@ EXPORT_SYMBOL_GPL(simple_util_remove);
int graph_util_card_probe(struct snd_soc_card *card) int graph_util_card_probe(struct snd_soc_card *card)
{ {
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(card);
int ret; int ret;
ret = asoc_simple_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; return ret;
ret = asoc_simple_init_mic(card, &priv->mic_jack, NULL); ret = simple_util_init_mic(card, &priv->mic_jack, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
sound/soc/generic/simple-card.c
View file @ b4b7de99
...@@ -23,13 +23,12 @@ ...@@ -23,13 +23,12 @@
#define PREFIX "simple-audio-card," #define PREFIX "simple-audio-card,"
static const struct snd_soc_ops simple_ops = { static const struct snd_soc_ops simple_ops = {
.startup = asoc_simple_startup, .startup = simple_util_startup,
.shutdown = asoc_simple_shutdown, .shutdown = simple_util_shutdown,
.hw_params = asoc_simple_hw_params, .hw_params = simple_util_hw_params,
}; };
static int asoc_simple_parse_platform(struct device_node *node, static int simple_parse_platform(struct device_node *node, struct snd_soc_dai_link_component *dlc)
struct snd_soc_dai_link_component *dlc)
{ {
struct of_phandle_args args; struct of_phandle_args args;
int ret; int ret;
...@@ -52,10 +51,10 @@ static int asoc_simple_parse_platform(struct device_node *node, ...@@ -52,10 +51,10 @@ static int asoc_simple_parse_platform(struct device_node *node,
return 0; return 0;
} }
static int asoc_simple_parse_dai(struct device *dev, static int simple_parse_dai(struct device *dev,
struct device_node *node, struct device_node *node,
struct snd_soc_dai_link_component *dlc, struct snd_soc_dai_link_component *dlc,
int *is_single_link) int *is_single_link)
{ {
struct of_phandle_args args; struct of_phandle_args args;
struct snd_soc_dai *dai; struct snd_soc_dai *dai;
...@@ -117,15 +116,15 @@ static int asoc_simple_parse_dai(struct device *dev, ...@@ -117,15 +116,15 @@ static int asoc_simple_parse_dai(struct device *dev,
static void simple_parse_convert(struct device *dev, static void simple_parse_convert(struct device *dev,
struct device_node *np, struct device_node *np,
struct asoc_simple_data *adata) struct simple_util_data *adata)
{ {
struct device_node *top = dev->of_node; struct device_node *top = dev->of_node;
struct device_node *node = of_get_parent(np); struct device_node *node = of_get_parent(np);
asoc_simple_parse_convert(top, PREFIX, adata); simple_util_parse_convert(top, PREFIX, adata);
asoc_simple_parse_convert(node, PREFIX, adata); simple_util_parse_convert(node, PREFIX, adata);
asoc_simple_parse_convert(node, NULL, adata); simple_util_parse_convert(node, NULL, adata);
asoc_simple_parse_convert(np, NULL, adata); simple_util_parse_convert(np, NULL, adata);
of_node_put(node); of_node_put(node);
} }
...@@ -148,7 +147,7 @@ static void simple_parse_mclk_fs(struct device_node *top, ...@@ -148,7 +147,7 @@ static void simple_parse_mclk_fs(struct device_node *top,
of_node_put(node); of_node_put(node);
} }
static int simple_parse_node(struct asoc_simple_priv *priv, static int simple_parse_node(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct link_info *li, struct link_info *li,
char *prefix, char *prefix,
...@@ -159,35 +158,35 @@ static int simple_parse_node(struct asoc_simple_priv *priv, ...@@ -159,35 +158,35 @@ static int simple_parse_node(struct asoc_simple_priv *priv,
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link);
struct snd_soc_dai_link_component *dlc; struct snd_soc_dai_link_component *dlc;
struct asoc_simple_dai *dai; struct simple_util_dai *dai;
int ret; int ret;
if (cpu) { if (cpu) {
dlc = asoc_link_to_cpu(dai_link, 0); dlc = snd_soc_link_to_cpu(dai_link, 0);
dai = simple_props_to_dai_cpu(dai_props, 0); dai = simple_props_to_dai_cpu(dai_props, 0);
} else { } else {
dlc = asoc_link_to_codec(dai_link, 0); dlc = snd_soc_link_to_codec(dai_link, 0);
dai = simple_props_to_dai_codec(dai_props, 0); dai = simple_props_to_dai_codec(dai_props, 0);
} }
simple_parse_mclk_fs(top, np, dai_props, prefix); simple_parse_mclk_fs(top, np, dai_props, prefix);
ret = asoc_simple_parse_dai(dev, np, dlc, cpu); ret = simple_parse_dai(dev, np, dlc, cpu);
if (ret) if (ret)
return ret; return ret;
ret = asoc_simple_parse_clk(dev, np, dai, dlc); ret = simple_util_parse_clk(dev, np, dai, dlc);
if (ret) if (ret)
return ret; return ret;
ret = asoc_simple_parse_tdm(np, dai); ret = simple_util_parse_tdm(np, dai);
if (ret) if (ret)
return ret; return ret;
return 0; return 0;
} }
static int simple_link_init(struct asoc_simple_priv *priv, static int simple_link_init(struct simple_util_priv *priv,
struct device_node *node, struct device_node *node,
struct device_node *codec, struct device_node *codec,
struct link_info *li, struct link_info *li,
...@@ -197,18 +196,18 @@ static int simple_link_init(struct asoc_simple_priv *priv, ...@@ -197,18 +196,18 @@ static int simple_link_init(struct asoc_simple_priv *priv,
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
int ret; int ret;
ret = asoc_simple_parse_daifmt(dev, node, codec, ret = simple_util_parse_daifmt(dev, node, codec,
prefix, &dai_link->dai_fmt); prefix, &dai_link->dai_fmt);
if (ret < 0) if (ret < 0)
return 0; return 0;
dai_link->init = asoc_simple_dai_init; dai_link->init = simple_util_dai_init;
dai_link->ops = &simple_ops; dai_link->ops = &simple_ops;
return asoc_simple_set_dailink_name(dev, dai_link, name); return simple_util_set_dailink_name(dev, dai_link, name);
} }
static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, static int simple_dai_link_of_dpcm(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct device_node *codec, struct device_node *codec,
struct link_info *li, struct link_info *li,
...@@ -230,8 +229,8 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -230,8 +229,8 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
prefix = PREFIX; prefix = PREFIX;
if (li->cpu) { if (li->cpu) {
struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); struct snd_soc_dai_link_component *cpus = snd_soc_link_to_cpu(dai_link, 0);
struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0); struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, 0);
int is_single_links = 0; int is_single_links = 0;
/* Codec is dummy */ /* Codec is dummy */
...@@ -246,17 +245,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -246,17 +245,17 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
snprintf(dai_name, sizeof(dai_name), "fe.%s", cpus->dai_name); snprintf(dai_name, sizeof(dai_name), "fe.%s", cpus->dai_name);
asoc_simple_canonicalize_cpu(cpus, is_single_links); simple_util_canonicalize_cpu(cpus, is_single_links);
asoc_simple_canonicalize_platform(platforms, cpus); simple_util_canonicalize_platform(platforms, cpus);
} else { } else {
struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, 0);
struct snd_soc_codec_conf *cconf; struct snd_soc_codec_conf *cconf;
/* CPU is dummy */ /* CPU is dummy */
/* BE settings */ /* BE settings */
dai_link->no_pcm = 1; dai_link->no_pcm = 1;
dai_link->be_hw_params_fixup = asoc_simple_be_hw_params_fixup; dai_link->be_hw_params_fixup = simple_util_be_hw_params_fixup;
cconf = simple_props_to_codec_conf(dai_props, 0); cconf = simple_props_to_codec_conf(dai_props, 0);
...@@ -288,7 +287,7 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, ...@@ -288,7 +287,7 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv,
return ret; return ret;
} }
static int simple_dai_link_of(struct asoc_simple_priv *priv, static int simple_dai_link_of(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct device_node *codec, struct device_node *codec,
struct link_info *li, struct link_info *li,
...@@ -296,9 +295,9 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, ...@@ -296,9 +295,9 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
{ {
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
struct snd_soc_dai_link_component *cpus = asoc_link_to_cpu(dai_link, 0); struct snd_soc_dai_link_component *cpus = snd_soc_link_to_cpu(dai_link, 0);
struct snd_soc_dai_link_component *codecs = asoc_link_to_codec(dai_link, 0); struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, 0);
struct snd_soc_dai_link_component *platforms = asoc_link_to_platform(dai_link, 0); struct snd_soc_dai_link_component *platforms = snd_soc_link_to_platform(dai_link, 0);
struct device_node *cpu = NULL; struct device_node *cpu = NULL;
struct device_node *node = NULL; struct device_node *node = NULL;
struct device_node *plat = NULL; struct device_node *plat = NULL;
...@@ -327,15 +326,15 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, ...@@ -327,15 +326,15 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
ret = asoc_simple_parse_platform(plat, platforms); ret = simple_parse_platform(plat, platforms);
if (ret < 0) if (ret < 0)
goto dai_link_of_err; goto dai_link_of_err;
snprintf(dai_name, sizeof(dai_name), snprintf(dai_name, sizeof(dai_name),
"%s-%s", cpus->dai_name, codecs->dai_name); "%s-%s", cpus->dai_name, codecs->dai_name);
asoc_simple_canonicalize_cpu(cpus, single_cpu); simple_util_canonicalize_cpu(cpus, single_cpu);
asoc_simple_canonicalize_platform(platforms, cpus); simple_util_canonicalize_platform(platforms, cpus);
ret = simple_link_init(priv, node, codec, li, prefix, dai_name); ret = simple_link_init(priv, node, codec, li, prefix, dai_name);
...@@ -348,13 +347,13 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, ...@@ -348,13 +347,13 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv,
return ret; return ret;
} }
static int __simple_for_each_link(struct asoc_simple_priv *priv, static int __simple_for_each_link(struct simple_util_priv *priv,
struct link_info *li, struct link_info *li,
int (*func_noml)(struct asoc_simple_priv *priv, int (*func_noml)(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct device_node *codec, struct device_node *codec,
struct link_info *li, bool is_top), struct link_info *li, bool is_top),
int (*func_dpcm)(struct asoc_simple_priv *priv, int (*func_dpcm)(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct device_node *codec, struct device_node *codec,
struct link_info *li, bool is_top)) struct link_info *li, bool is_top))
...@@ -378,7 +377,7 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv, ...@@ -378,7 +377,7 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv,
/* loop for all dai-link */ /* loop for all dai-link */
do { do {
struct asoc_simple_data adata; struct simple_util_data adata;
struct device_node *codec; struct device_node *codec;
struct device_node *plat; struct device_node *plat;
struct device_node *np; struct device_node *np;
...@@ -419,7 +418,7 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv, ...@@ -419,7 +418,7 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv,
* or has convert-xxx property * or has convert-xxx property
*/ */
if (dpcm_selectable && if (dpcm_selectable &&
(num > 2 || asoc_simple_is_convert_required(&adata))) { (num > 2 || simple_util_is_convert_required(&adata))) {
/* /*
* np * np
* |1(CPU)|0(Codec) li->cpu * |1(CPU)|0(Codec) li->cpu
...@@ -459,13 +458,13 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv, ...@@ -459,13 +458,13 @@ static int __simple_for_each_link(struct asoc_simple_priv *priv,
return ret; return ret;
} }
static int simple_for_each_link(struct asoc_simple_priv *priv, static int simple_for_each_link(struct simple_util_priv *priv,
struct link_info *li, struct link_info *li,
int (*func_noml)(struct asoc_simple_priv *priv, int (*func_noml)(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct device_node *codec, struct device_node *codec,
struct link_info *li, bool is_top), struct link_info *li, bool is_top),
int (*func_dpcm)(struct asoc_simple_priv *priv, int (*func_dpcm)(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct device_node *codec, struct device_node *codec,
struct link_info *li, bool is_top)) struct link_info *li, bool is_top))
...@@ -494,12 +493,12 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, ...@@ -494,12 +493,12 @@ static int simple_for_each_link(struct asoc_simple_priv *priv,
static void simple_depopulate_aux(void *data) static void simple_depopulate_aux(void *data)
{ {
struct asoc_simple_priv *priv = data; struct simple_util_priv *priv = data;
of_platform_depopulate(simple_priv_to_dev(priv)); of_platform_depopulate(simple_priv_to_dev(priv));
} }
static int simple_populate_aux(struct asoc_simple_priv *priv) static int simple_populate_aux(struct simple_util_priv *priv)
{ {
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
struct device_node *node; struct device_node *node;
...@@ -517,20 +516,20 @@ static int simple_populate_aux(struct asoc_simple_priv *priv) ...@@ -517,20 +516,20 @@ static int simple_populate_aux(struct asoc_simple_priv *priv)
return devm_add_action_or_reset(dev, simple_depopulate_aux, priv); return devm_add_action_or_reset(dev, simple_depopulate_aux, priv);
} }
static int simple_parse_of(struct asoc_simple_priv *priv, struct link_info *li) static int simple_parse_of(struct simple_util_priv *priv, struct link_info *li)
{ {
struct snd_soc_card *card = simple_priv_to_card(priv); struct snd_soc_card *card = simple_priv_to_card(priv);
int ret; int ret;
ret = asoc_simple_parse_widgets(card, PREFIX); ret = simple_util_parse_widgets(card, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_routing(card, PREFIX); ret = simple_util_parse_routing(card, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_pin_switches(card, PREFIX); ret = simple_util_parse_pin_switches(card, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -542,7 +541,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv, struct link_info *li) ...@@ -542,7 +541,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv, struct link_info *li)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_parse_card_name(card, PREFIX); ret = simple_util_parse_card_name(card, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -555,7 +554,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv, struct link_info *li) ...@@ -555,7 +554,7 @@ static int simple_parse_of(struct asoc_simple_priv *priv, struct link_info *li)
return ret; return ret;
} }
static int simple_count_noml(struct asoc_simple_priv *priv, static int simple_count_noml(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct device_node *codec, struct device_node *codec,
struct link_info *li, bool is_top) struct link_info *li, bool is_top)
...@@ -579,7 +578,7 @@ static int simple_count_noml(struct asoc_simple_priv *priv, ...@@ -579,7 +578,7 @@ static int simple_count_noml(struct asoc_simple_priv *priv,
* ignored by snd_soc_rtd_add_component(). * ignored by snd_soc_rtd_add_component().
* *
* see * see
* simple-card-utils.c :: asoc_simple_canonicalize_platform() * simple-card-utils.c :: simple_util_canonicalize_platform()
*/ */
li->num[li->link].cpus = 1; li->num[li->link].cpus = 1;
li->num[li->link].platforms = 1; li->num[li->link].platforms = 1;
...@@ -591,7 +590,7 @@ static int simple_count_noml(struct asoc_simple_priv *priv, ...@@ -591,7 +590,7 @@ static int simple_count_noml(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static int simple_count_dpcm(struct asoc_simple_priv *priv, static int simple_count_dpcm(struct simple_util_priv *priv,
struct device_node *np, struct device_node *np,
struct device_node *codec, struct device_node *codec,
struct link_info *li, bool is_top) struct link_info *li, bool is_top)
...@@ -622,7 +621,7 @@ static int simple_count_dpcm(struct asoc_simple_priv *priv, ...@@ -622,7 +621,7 @@ static int simple_count_dpcm(struct asoc_simple_priv *priv,
return 0; return 0;
} }
static int simple_get_dais_count(struct asoc_simple_priv *priv, static int simple_get_dais_count(struct simple_util_priv *priv,
struct link_info *li) struct link_info *li)
{ {
struct device *dev = simple_priv_to_dev(priv); struct device *dev = simple_priv_to_dev(priv);
...@@ -690,27 +689,27 @@ static int simple_get_dais_count(struct asoc_simple_priv *priv, ...@@ -690,27 +689,27 @@ static int simple_get_dais_count(struct asoc_simple_priv *priv,
static int simple_soc_probe(struct snd_soc_card *card) static int simple_soc_probe(struct snd_soc_card *card)
{ {
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); struct simple_util_priv *priv = snd_soc_card_get_drvdata(card);
int ret; int ret;
ret = asoc_simple_init_hp(card, &priv->hp_jack, PREFIX); ret = simple_util_init_hp(card, &priv->hp_jack, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_init_mic(card, &priv->mic_jack, PREFIX); ret = simple_util_init_mic(card, &priv->mic_jack, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = asoc_simple_init_aux_jacks(priv, PREFIX); ret = simple_util_init_aux_jacks(priv, PREFIX);
if (ret < 0) if (ret < 0)
return ret; return ret;
return 0; return 0;
} }
static int asoc_simple_probe(struct platform_device *pdev) static int simple_probe(struct platform_device *pdev)
{ {
struct asoc_simple_priv *priv; struct simple_util_priv *priv;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct snd_soc_card *card; struct snd_soc_card *card;
...@@ -739,7 +738,7 @@ static int asoc_simple_probe(struct platform_device *pdev) ...@@ -739,7 +738,7 @@ static int asoc_simple_probe(struct platform_device *pdev)
if (!li->link) if (!li->link)
return -EINVAL; return -EINVAL;
ret = asoc_simple_init_priv(priv, li); ret = simple_util_init_priv(priv, li);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -752,7 +751,7 @@ static int asoc_simple_probe(struct platform_device *pdev) ...@@ -752,7 +751,7 @@ static int asoc_simple_probe(struct platform_device *pdev)
} }
} else { } else {
struct asoc_simple_card_info *cinfo; struct simple_util_info *cinfo;
struct snd_soc_dai_link_component *cpus; struct snd_soc_dai_link_component *cpus;
struct snd_soc_dai_link_component *codecs; struct snd_soc_dai_link_component *codecs;
struct snd_soc_dai_link_component *platform; struct snd_soc_dai_link_component *platform;
...@@ -770,7 +769,7 @@ static int asoc_simple_probe(struct platform_device *pdev) ...@@ -770,7 +769,7 @@ static int asoc_simple_probe(struct platform_device *pdev)
!cinfo->codec || !cinfo->codec ||
!cinfo->platform || !cinfo->platform ||
!cinfo->cpu_dai.name) { !cinfo->cpu_dai.name) {
dev_err(dev, "insufficient asoc_simple_card_info settings\n"); dev_err(dev, "insufficient simple_util_info settings\n");
return -EINVAL; return -EINVAL;
} }
...@@ -788,7 +787,7 @@ static int asoc_simple_probe(struct platform_device *pdev) ...@@ -788,7 +787,7 @@ static int asoc_simple_probe(struct platform_device *pdev)
dai_link->name = cinfo->name; dai_link->name = cinfo->name;
dai_link->stream_name = cinfo->name; dai_link->stream_name = cinfo->name;
dai_link->dai_fmt = cinfo->daifmt; dai_link->dai_fmt = cinfo->daifmt;
dai_link->init = asoc_simple_dai_init; dai_link->init = simple_util_dai_init;
memcpy(dai_props->cpu_dai, &cinfo->cpu_dai, memcpy(dai_props->cpu_dai, &cinfo->cpu_dai,
sizeof(*dai_props->cpu_dai)); sizeof(*dai_props->cpu_dai));
memcpy(dai_props->codec_dai, &cinfo->codec_dai, memcpy(dai_props->codec_dai, &cinfo->codec_dai,
...@@ -797,7 +796,7 @@ static int asoc_simple_probe(struct platform_device *pdev) ...@@ -797,7 +796,7 @@ static int asoc_simple_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(card, priv); snd_soc_card_set_drvdata(card, priv);
asoc_simple_debug_info(priv); simple_util_debug_info(priv);
ret = devm_snd_soc_register_card(dev, card); ret = devm_snd_soc_register_card(dev, card);
if (ret < 0) if (ret < 0)
...@@ -806,7 +805,7 @@ static int asoc_simple_probe(struct platform_device *pdev) ...@@ -806,7 +805,7 @@ static int asoc_simple_probe(struct platform_device *pdev)
devm_kfree(dev, li); devm_kfree(dev, li);
return 0; return 0;
err: err:
asoc_simple_clean_reference(card); simple_util_clean_reference(card);
return ret; return ret;
} }
...@@ -819,17 +818,17 @@ static const struct of_device_id simple_of_match[] = { ...@@ -819,17 +818,17 @@ static const struct of_device_id simple_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, simple_of_match); MODULE_DEVICE_TABLE(of, simple_of_match);
static struct platform_driver asoc_simple_card = { static struct platform_driver simple_card = {
.driver = { .driver = {
.name = "asoc-simple-card", .name = "asoc-simple-card",
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
.of_match_table = simple_of_match, .of_match_table = simple_of_match,
}, },
.probe = asoc_simple_probe, .probe = simple_probe,
.remove = asoc_simple_remove, .remove = simple_util_remove,
}; };
module_platform_driver(asoc_simple_card); module_platform_driver(simple_card);
MODULE_ALIAS("platform:asoc-simple-card"); MODULE_ALIAS("platform:asoc-simple-card");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
......
sound/soc/generic/test-component.c
View file @ b4b7de99
...@@ -352,7 +352,7 @@ static const struct snd_pcm_hardware test_component_hardware = { ...@@ -352,7 +352,7 @@ static const struct snd_pcm_hardware test_component_hardware = {
static int test_component_open(struct snd_soc_component *component, static int test_component_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
mile_stone(component); mile_stone(component);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7