* [PATCH v2 1/3] ASoC: audio-graph: Rename functions needed for export
2021-02-04 13:50 [PATCH v2 0/3] Rename audio graph export functions Sameer Pujar
@ 2021-02-04 13:50 ` Sameer Pujar
2021-02-04 13:50 ` [PATCH v2 2/3] ASoC: tegra: Update references of audio graph helpers Sameer Pujar
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Sameer Pujar @ 2021-02-04 13:50 UTC (permalink / raw)
To: broonie
Cc: thierry.reding, jonathanh, kuninori.morimoto.gx, alsa-devel,
linux-tegra, linux-kernel, sharadg, Sameer Pujar
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 in header and source files of audio graph are
updated to make use of above.
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/graph_card.h | 6 ++++--
sound/soc/generic/audio-graph-card.c | 17 +++++++++--------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/include/sound/graph_card.h b/include/sound/graph_card.h
index bbb5a13..0137844 100644
--- a/include/sound/graph_card.h
+++ b/include/sound/graph_card.h
@@ -9,8 +9,10 @@
#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 */
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 16a04a6..8c5cdcd 100644
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -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,
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 link_info li;
@@ -608,7 +608,7 @@ int graph_parse_of(struct asoc_simple_priv *priv, struct device *dev)
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,
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);
}
-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);
int ret;
@@ -720,7 +720,7 @@ int graph_card_probe(struct snd_soc_card *card)
return 0;
}
-EXPORT_SYMBOL_GPL(graph_card_probe);
+EXPORT_SYMBOL_GPL(audio_graph_card_probe);
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->dapm_widgets = 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))
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);
return asoc_simple_clean_reference(card);
}
+EXPORT_SYMBOL_GPL(audio_graph_remove);
static const struct of_device_id graph_of_match[] = {
{ .compatible = "audio-graph-card", },
@@ -766,7 +767,7 @@ static struct platform_driver graph_card = {
.of_match_table = graph_of_match,
},
.probe = graph_probe,
- .remove = graph_remove,
+ .remove = audio_graph_remove,
};
module_platform_driver(graph_card);
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] ASoC: tegra: Update references of audio graph helpers
2021-02-04 13:50 [PATCH v2 0/3] Rename audio graph export functions Sameer Pujar
2021-02-04 13:50 ` [PATCH v2 1/3] ASoC: audio-graph: Rename functions needed for export Sameer Pujar
@ 2021-02-04 13:50 ` Sameer Pujar
2021-02-04 13:50 ` [PATCH v2 3/3] ASoC: tegra: Add driver remove() callback Sameer Pujar
2021-02-04 22:20 ` [PATCH v2 0/3] Rename audio graph export functions Kuninori Morimoto
3 siblings, 0 replies; 6+ messages in thread
From: Sameer Pujar @ 2021-02-04 13:50 UTC (permalink / raw)
To: broonie
Cc: thierry.reding, jonathanh, kuninori.morimoto.gx, alsa-devel,
linux-tegra, linux-kernel, sharadg, Sameer Pujar
The audio graph helper functions are renamed now for a better global
visibility and hence references need to be updated in Tegra audio
graph.
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
sound/soc/tegra/tegra_audio_graph_card.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c
index 9e43f16..121e572 100644
--- a/sound/soc/tegra/tegra_audio_graph_card.c
+++ b/sound/soc/tegra/tegra_audio_graph_card.c
@@ -184,7 +184,7 @@ static int tegra_audio_graph_card_probe(struct snd_soc_card *card)
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)
@@ -201,12 +201,12 @@ static int tegra_audio_graph_probe(struct platform_device *pdev)
card->probe = tegra_audio_graph_card_probe;
- /* graph_parse_of() depends on below */
+ /* audio_graph_parse_of() depends on below */
card->component_chaining = 1;
priv->simple.ops = &tegra_audio_graph_ops;
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 = {
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] ASoC: tegra: Add driver remove() callback
2021-02-04 13:50 [PATCH v2 0/3] Rename audio graph export functions Sameer Pujar
2021-02-04 13:50 ` [PATCH v2 1/3] ASoC: audio-graph: Rename functions needed for export Sameer Pujar
2021-02-04 13:50 ` [PATCH v2 2/3] ASoC: tegra: Update references of audio graph helpers Sameer Pujar
@ 2021-02-04 13:50 ` Sameer Pujar
2021-02-04 22:20 ` [PATCH v2 0/3] Rename audio graph export functions Kuninori Morimoto
3 siblings, 0 replies; 6+ messages in thread
From: Sameer Pujar @ 2021-02-04 13:50 UTC (permalink / raw)
To: broonie
Cc: thierry.reding, jonathanh, kuninori.morimoto.gx, alsa-devel,
linux-tegra, linux-kernel, sharadg, Sameer Pujar
There is cleanup required, related to release of phandles, during driver
removal and hence point remove function pointer to audio_graph_remove().
Fixes: 202e2f774543 ("ASoC: tegra: Add audio graph based card driver")
Depends-on: "ASoC: audio-graph: Rename functions needed for export"
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
sound/soc/tegra/tegra_audio_graph_card.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c
index 121e572..ddedf18 100644
--- a/sound/soc/tegra/tegra_audio_graph_card.c
+++ b/sound/soc/tegra/tegra_audio_graph_card.c
@@ -2,7 +2,7 @@
//
// tegra_audio_graph_card.c - Audio Graph based Tegra Machine Driver
//
-// Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2020-2021 NVIDIA CORPORATION. All rights reserved.
#include <linux/math64.h>
#include <linux/module.h>
@@ -243,6 +243,7 @@ static struct platform_driver tegra_audio_graph_card = {
.of_match_table = graph_of_tegra_match,
},
.probe = tegra_audio_graph_probe,
+ .remove = audio_graph_remove,
};
module_platform_driver(tegra_audio_graph_card);
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread