redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: Update name of debugfs root symbol to snd_soc_ 

Everything else is using snd_soc_ so we should use it here too.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
hifive-unleashed-5.1
Mark Brown 2011-01-10 22:25:21 +00:00
parent 8b75d714a6
commit 8a9dab1a55
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/soc.h
View File

@ -757,7 +757,7 @@ static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
#include <sound/soc-dai.h>
#ifdef CONFIG_DEBUG_FS
extern struct dentry *asoc_debugfs_root;
extern struct dentry *snd_soc_debugfs_root;
#endif
#endif

20
sound/soc/soc-core.c
View File

@ -48,8 +48,8 @@ static DEFINE_MUTEX(pcm_mutex);
static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq);
#ifdef CONFIG_DEBUG_FS
struct dentry *asoc_debugfs_root;
EXPORT_SYMBOL_GPL(asoc_debugfs_root);
struct dentry *snd_soc_debugfs_root;
EXPORT_SYMBOL_GPL(snd_soc_debugfs_root);
#endif
static DEFINE_MUTEX(client_mutex);
@ -361,7 +361,7 @@ static const struct file_operations platform_list_fops = {
static void soc_init_card_debugfs(struct snd_soc_card *card)
{
card->debugfs_card_root = debugfs_create_dir(card->name,
asoc_debugfs_root);
snd_soc_debugfs_root);
if (!card->debugfs_card_root) {
dev_warn(card->dev,
"ASoC: Failed to create codec debugfs directory\n");
@ -3584,22 +3584,22 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
static int __init snd_soc_init(void)
{
#ifdef CONFIG_DEBUG_FS
asoc_debugfs_root = debugfs_create_dir("asoc", NULL);
if (IS_ERR(asoc_debugfs_root) || !asoc_debugfs_root) {
snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL);
if (IS_ERR(snd_soc_debugfs_root) || !snd_soc_debugfs_root) {
printk(KERN_WARNING
"ASoC: Failed to create debugfs directory\n");
asoc_debugfs_root = NULL;
snd_soc_debugfs_root = NULL;
}
if (!debugfs_create_file("codecs", 0444, asoc_debugfs_root, NULL,
if (!debugfs_create_file("codecs", 0444, snd_soc_debugfs_root, NULL,
&codec_list_fops))
pr_warn("ASoC: Failed to create CODEC list debugfs file\n");
if (!debugfs_create_file("dais", 0444, asoc_debugfs_root, NULL,
if (!debugfs_create_file("dais", 0444, snd_soc_debugfs_root, NULL,
&dai_list_fops))
pr_warn("ASoC: Failed to create DAI list debugfs file\n");
if (!debugfs_create_file("platforms", 0444, asoc_debugfs_root, NULL,
if (!debugfs_create_file("platforms", 0444, snd_soc_debugfs_root, NULL,
&platform_list_fops))
pr_warn("ASoC: Failed to create platform list debugfs file\n");
#endif
@ -3611,7 +3611,7 @@ module_init(snd_soc_init);
static void __exit snd_soc_exit(void)
{
#ifdef CONFIG_DEBUG_FS
debugfs_remove_recursive(asoc_debugfs_root);
debugfs_remove_recursive(snd_soc_debugfs_root);
#endif
platform_driver_unregister(&soc_driver);
}

5
sound/soc/tegra/tegra_das.c
View File

@ -144,8 +144,9 @@ static const struct file_operations tegra_das_debug_fops = {
static void tegra_das_debug_add(struct tegra_das *das)
{
das->debug = debugfs_create_file(DRV_NAME, S_IRUGO, asoc_debugfs_root,
das, &tegra_das_debug_fops);
das->debug = debugfs_create_file(DRV_NAME, S_IRUGO,
snd_soc_debugfs_root, das,
&tegra_das_debug_fops);
}
static void tegra_das_debug_remove(struct tegra_das *das)

2
sound/soc/tegra/tegra_i2s.c
View File

@ -104,7 +104,7 @@ static void tegra_i2s_debug_add(struct tegra_i2s *i2s, int id)
char name[] = DRV_NAME ".0";
snprintf(name, sizeof(name), DRV_NAME".%1d", id);
i2s->debug = debugfs_create_file(name, S_IRUGO, asoc_debugfs_root,
i2s->debug = debugfs_create_file(name, S_IRUGO, snd_soc_debugfs_root,
i2s, &tegra_i2s_debug_fops);
}