lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Add sound card directory under debugfs/asoc/

Browse Source 
There will be need to have sound card specific debugfs entries. This patch
introduces a new debugfs/asoc/{card->name}/ directory but does not add yet
any entries there.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Jarkko Nikula
2010-11-05 20:35:19 +02:00
committed by Mark Brown
parent ce6120cca2
commit a605215494
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sound/soc.h
View File

@@ -589,6 +589,10 @@ struct snd_soc_card {
struct list_head codec_dev_list; struct list_head codec_dev_list;
struct list_head platform_dev_list; struct list_head platform_dev_list;
struct list_head dai_dev_list; struct list_head dai_dev_list;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_card_root;
#endif
}; };
/* SoC machine DAI configuration, glues a codec and cpu DAI together */ /* SoC machine DAI configuration, glues a codec and cpu DAI together */

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

@@ -374,6 +374,20 @@ static const struct file_operations platform_list_fops = {
.llseek = default_llseek,/* read accesses f_pos */ .llseek = default_llseek,/* read accesses f_pos */
}; };
static void soc_init_card_debugfs(struct snd_soc_card *card)
{
card->debugfs_card_root = debugfs_create_dir(card->name,
debugfs_root);
if (!card->debugfs_card_root)
dev_warn(card->dev,
"ASoC: Failed to create codec debugfs directory\n");
}
static void soc_cleanup_card_debugfs(struct snd_soc_card *card)
{
debugfs_remove_recursive(card->debugfs_card_root);
}
#else #else
static inline void soc_init_codec_debugfs(struct snd_soc_codec *codec) static inline void soc_init_codec_debugfs(struct snd_soc_codec *codec)
@@ -1667,6 +1681,8 @@ static int soc_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&card->codec_dev_list); INIT_LIST_HEAD(&card->codec_dev_list);
INIT_LIST_HEAD(&card->platform_dev_list); INIT_LIST_HEAD(&card->platform_dev_list);
soc_init_card_debugfs(card);
ret = snd_soc_register_card(card); ret = snd_soc_register_card(card);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "Failed to register card\n"); dev_err(&pdev->dev, "Failed to register card\n");
@@ -1694,6 +1710,8 @@ static int soc_remove(struct platform_device *pdev)
for (i = 0; i < card->num_rtd; i++) for (i = 0; i < card->num_rtd; i++)
soc_remove_dai_link(card, i); soc_remove_dai_link(card, i);
soc_cleanup_card_debugfs(card);
/* remove the card */ /* remove the card */
if (card->remove) if (card->remove)
card->remove(pdev); card->remove(pdev);