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

ASoC: audio-graph: Rename functions needed for export

Browse Source 
Following functions are renamed for a better global visibility.
  graph_card_probe() --> audio_graph_card_probe()
  graph_parse_of()   --> audio_graph_parse_of()
  graph_remove()     --> audio_graph_remove() [exported as well]

The references of these are updated in audio graph and Tegra audio
graph card drivers.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/1612719418-5858-2-git-send-email-spujar@nvidia.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Sameer Pujar
2021-02-07 23:06:57 +05:30
committed by Mark Brown
parent f08c74a3b5
commit 6e4ea8aace
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/graph_card.h
View File

@ -9,8 +9,10 @@
#include <sound/simple_card_utils.h> #include <sound/simple_card_utils.h>
int graph_card_probe(struct snd_soc_card *card); int audio_graph_card_probe(struct snd_soc_card *card);
int graph_parse_of(struct asoc_simple_priv *priv, struct device *dev); int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev);
int audio_graph_remove(struct platform_device *pdev);
#endif /* __GRAPH_CARD_H */ #endif /* __GRAPH_CARD_H */

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

@ -532,7 +532,7 @@ static int graph_for_each_link(struct asoc_simple_priv *priv,
static void graph_get_dais_count(struct asoc_simple_priv *priv, static void graph_get_dais_count(struct asoc_simple_priv *priv,
struct link_info *li); struct link_info *li);
int graph_parse_of(struct asoc_simple_priv *priv, struct device *dev) int audio_graph_parse_of(struct asoc_simple_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;
@ -608,7 +608,7 @@ err:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(graph_parse_of); EXPORT_SYMBOL_GPL(audio_graph_parse_of);
static int graph_count_noml(struct asoc_simple_priv *priv, static int graph_count_noml(struct asoc_simple_priv *priv,
struct device_node *cpu_ep, struct device_node *cpu_ep,
@ -705,7 +705,7 @@ static void graph_get_dais_count(struct asoc_simple_priv *priv,
li->link, li->dais, li->conf); li->link, li->dais, li->conf);
} }
int graph_card_probe(struct snd_soc_card *card) int audio_graph_card_probe(struct snd_soc_card *card)
{ {
struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card); struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card);
int ret; int ret;
@ -720,7 +720,7 @@ int graph_card_probe(struct snd_soc_card *card)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(graph_card_probe); EXPORT_SYMBOL_GPL(audio_graph_card_probe);
static int graph_probe(struct platform_device *pdev) static int graph_probe(struct platform_device *pdev)
{ {
@ -736,20 +736,21 @@ 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 = graph_card_probe; card->probe = audio_graph_card_probe;
if (of_device_get_match_data(dev)) if (of_device_get_match_data(dev))
priv->dpcm_selectable = 1; priv->dpcm_selectable = 1;
return graph_parse_of(priv, dev); return audio_graph_parse_of(priv, dev);
} }
static int graph_remove(struct platform_device *pdev) int audio_graph_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
return asoc_simple_clean_reference(card); return asoc_simple_clean_reference(card);
} }
EXPORT_SYMBOL_GPL(audio_graph_remove);
static const struct of_device_id graph_of_match[] = { static const struct of_device_id graph_of_match[] = {
{ .compatible = "audio-graph-card", }, { .compatible = "audio-graph-card", },
@ -766,7 +767,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 = graph_remove, .remove = audio_graph_remove,
}; };
module_platform_driver(graph_card); module_platform_driver(graph_card);

6
sound/soc/tegra/tegra_audio_graph_card.c
View File

@ -184,7 +184,7 @@ static int tegra_audio_graph_card_probe(struct snd_soc_card *card)
return PTR_ERR(priv->clk_plla_out0); return PTR_ERR(priv->clk_plla_out0);
} }
return graph_card_probe(card); return audio_graph_card_probe(card);
} }
static int tegra_audio_graph_probe(struct platform_device *pdev) static int tegra_audio_graph_probe(struct platform_device *pdev)
@ -201,12 +201,12 @@ static int tegra_audio_graph_probe(struct platform_device *pdev)
card->probe = tegra_audio_graph_card_probe; card->probe = tegra_audio_graph_card_probe;
/* graph_parse_of() depends on below */ /* audio_graph_parse_of() depends on below */
card->component_chaining = 1; card->component_chaining = 1;
priv->simple.ops = &tegra_audio_graph_ops; priv->simple.ops = &tegra_audio_graph_ops;
priv->simple.force_dpcm = 1; priv->simple.force_dpcm = 1;
return graph_parse_of(&priv->simple, dev); return audio_graph_parse_of(&priv->simple, dev);
} }
static const struct tegra_audio_cdata tegra210_data = { static const struct tegra_audio_cdata tegra210_data = {