diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-10 17:25:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-10 17:25:21 -0500 |
commit | 8a9dab1a555e3f2088c68cae792dfd7e854e65e4 (patch) | |
tree | fe7bb59e0f3b3dc1d35a1e5044b10a3e9d395d86 /sound | |
parent | 8b75d714a6ae6445841006ae2074dae095608c36 (diff) |
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-core.c | 20 | ||||
-rw-r--r-- | sound/soc/tegra/tegra_das.c | 5 | ||||
-rw-r--r-- | sound/soc/tegra/tegra_i2s.c | 2 |
3 files changed, 14 insertions, 13 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0484e504b589..2ff708a41119 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -48,8 +48,8 @@ static DEFINE_MUTEX(pcm_mutex); | |||
48 | static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq); | 48 | static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq); |
49 | 49 | ||
50 | #ifdef CONFIG_DEBUG_FS | 50 | #ifdef CONFIG_DEBUG_FS |
51 | struct dentry *asoc_debugfs_root; | 51 | struct dentry *snd_soc_debugfs_root; |
52 | EXPORT_SYMBOL_GPL(asoc_debugfs_root); | 52 | EXPORT_SYMBOL_GPL(snd_soc_debugfs_root); |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | static DEFINE_MUTEX(client_mutex); | 55 | static DEFINE_MUTEX(client_mutex); |
@@ -361,7 +361,7 @@ static const struct file_operations platform_list_fops = { | |||
361 | static void soc_init_card_debugfs(struct snd_soc_card *card) | 361 | static void soc_init_card_debugfs(struct snd_soc_card *card) |
362 | { | 362 | { |
363 | card->debugfs_card_root = debugfs_create_dir(card->name, | 363 | card->debugfs_card_root = debugfs_create_dir(card->name, |
364 | asoc_debugfs_root); | 364 | snd_soc_debugfs_root); |
365 | if (!card->debugfs_card_root) { | 365 | if (!card->debugfs_card_root) { |
366 | dev_warn(card->dev, | 366 | dev_warn(card->dev, |
367 | "ASoC: Failed to create codec debugfs directory\n"); | 367 | "ASoC: Failed to create codec debugfs directory\n"); |
@@ -3584,22 +3584,22 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_codec); | |||
3584 | static int __init snd_soc_init(void) | 3584 | static int __init snd_soc_init(void) |
3585 | { | 3585 | { |
3586 | #ifdef CONFIG_DEBUG_FS | 3586 | #ifdef CONFIG_DEBUG_FS |
3587 | asoc_debugfs_root = debugfs_create_dir("asoc", NULL); | 3587 | snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL); |
3588 | if (IS_ERR(asoc_debugfs_root) || !asoc_debugfs_root) { | 3588 | if (IS_ERR(snd_soc_debugfs_root) || !snd_soc_debugfs_root) { |
3589 | printk(KERN_WARNING | 3589 | printk(KERN_WARNING |
3590 | "ASoC: Failed to create debugfs directory\n"); | 3590 | "ASoC: Failed to create debugfs directory\n"); |
3591 | asoc_debugfs_root = NULL; | 3591 | snd_soc_debugfs_root = NULL; |
3592 | } | 3592 | } |
3593 | 3593 | ||
3594 | if (!debugfs_create_file("codecs", 0444, asoc_debugfs_root, NULL, | 3594 | if (!debugfs_create_file("codecs", 0444, snd_soc_debugfs_root, NULL, |
3595 | &codec_list_fops)) | 3595 | &codec_list_fops)) |
3596 | pr_warn("ASoC: Failed to create CODEC list debugfs file\n"); | 3596 | pr_warn("ASoC: Failed to create CODEC list debugfs file\n"); |
3597 | 3597 | ||
3598 | if (!debugfs_create_file("dais", 0444, asoc_debugfs_root, NULL, | 3598 | if (!debugfs_create_file("dais", 0444, snd_soc_debugfs_root, NULL, |
3599 | &dai_list_fops)) | 3599 | &dai_list_fops)) |
3600 | pr_warn("ASoC: Failed to create DAI list debugfs file\n"); | 3600 | pr_warn("ASoC: Failed to create DAI list debugfs file\n"); |
3601 | 3601 | ||
3602 | if (!debugfs_create_file("platforms", 0444, asoc_debugfs_root, NULL, | 3602 | if (!debugfs_create_file("platforms", 0444, snd_soc_debugfs_root, NULL, |
3603 | &platform_list_fops)) | 3603 | &platform_list_fops)) |
3604 | pr_warn("ASoC: Failed to create platform list debugfs file\n"); | 3604 | pr_warn("ASoC: Failed to create platform list debugfs file\n"); |
3605 | #endif | 3605 | #endif |
@@ -3611,7 +3611,7 @@ module_init(snd_soc_init); | |||
3611 | static void __exit snd_soc_exit(void) | 3611 | static void __exit snd_soc_exit(void) |
3612 | { | 3612 | { |
3613 | #ifdef CONFIG_DEBUG_FS | 3613 | #ifdef CONFIG_DEBUG_FS |
3614 | debugfs_remove_recursive(asoc_debugfs_root); | 3614 | debugfs_remove_recursive(snd_soc_debugfs_root); |
3615 | #endif | 3615 | #endif |
3616 | platform_driver_unregister(&soc_driver); | 3616 | platform_driver_unregister(&soc_driver); |
3617 | } | 3617 | } |
diff --git a/sound/soc/tegra/tegra_das.c b/sound/soc/tegra/tegra_das.c index 796d36d5188a..01eb9c9301de 100644 --- a/sound/soc/tegra/tegra_das.c +++ b/sound/soc/tegra/tegra_das.c | |||
@@ -144,8 +144,9 @@ static const struct file_operations tegra_das_debug_fops = { | |||
144 | 144 | ||
145 | static void tegra_das_debug_add(struct tegra_das *das) | 145 | static void tegra_das_debug_add(struct tegra_das *das) |
146 | { | 146 | { |
147 | das->debug = debugfs_create_file(DRV_NAME, S_IRUGO, asoc_debugfs_root, | 147 | das->debug = debugfs_create_file(DRV_NAME, S_IRUGO, |
148 | das, &tegra_das_debug_fops); | 148 | snd_soc_debugfs_root, das, |
149 | &tegra_das_debug_fops); | ||
149 | } | 150 | } |
150 | 151 | ||
151 | static void tegra_das_debug_remove(struct tegra_das *das) | 152 | static void tegra_das_debug_remove(struct tegra_das *das) |
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c index 9b7a22af52a6..1730509c8ac2 100644 --- a/sound/soc/tegra/tegra_i2s.c +++ b/sound/soc/tegra/tegra_i2s.c | |||
@@ -104,7 +104,7 @@ static void tegra_i2s_debug_add(struct tegra_i2s *i2s, int id) | |||
104 | char name[] = DRV_NAME ".0"; | 104 | char name[] = DRV_NAME ".0"; |
105 | 105 | ||
106 | snprintf(name, sizeof(name), DRV_NAME".%1d", id); | 106 | snprintf(name, sizeof(name), DRV_NAME".%1d", id); |
107 | i2s->debug = debugfs_create_file(name, S_IRUGO, asoc_debugfs_root, | 107 | i2s->debug = debugfs_create_file(name, S_IRUGO, snd_soc_debugfs_root, |
108 | i2s, &tegra_i2s_debug_fops); | 108 | i2s, &tegra_i2s_debug_fops); |
109 | } | 109 | } |
110 | 110 | ||