Skip to content

Commit

Permalink
ASoC: Push debugfs files out of the snd_soc_device structure
Browse files Browse the repository at this point in the history 
This is in preparation for the removal of struct snd_soc_device.

The pop time configuration should really be a property of the card not
the codec but since DAPM currently uses the codec rather than the card
using the codec is fine for now.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Dec 3, 2008
1 parent 6f2a974 commit 384c89e
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 35 deletions.
8 changes: 5 additions & 3 deletions include/sound/soc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,11 @@ struct snd_soc_codec {
/* codec DAI's */
struct snd_soc_dai *dai;
unsigned int num_dai;

#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_reg;
struct dentry *debugfs_pop_time;
#endif
};

/* codec device */
Expand Down Expand Up @@ -364,9 +369,6 @@ struct snd_soc_device {
struct snd_soc_codec *codec;
struct snd_soc_codec_device *codec_dev;
void *codec_data;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_root;
#endif
};

/* runtime channel data */
Expand Down
73 changes: 41 additions & 32 deletions sound/soc/soc-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ static DEFINE_MUTEX(pcm_mutex);
static DEFINE_MUTEX(io_mutex);
static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq);

#ifdef CONFIG_DEBUG_FS
static struct dentry *debugfs_root;
#endif

/*
* This is a timeout to do a DAPM powerdown after a stream is closed().
* It can be used to eliminate pops between different playback streams, e.g.
Expand Down Expand Up @@ -1002,7 +1006,9 @@ static ssize_t codec_reg_read_file(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
ssize_t ret;
struct snd_soc_device *devdata = file->private_data;
struct snd_soc_codec *codec = file->private_data;
struct device *card_dev = codec->card->dev;
struct snd_soc_device *devdata = card_dev->driver_data;
char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!buf)
return -ENOMEM;
Expand All @@ -1021,8 +1027,7 @@ static ssize_t codec_reg_write_file(struct file *file,
char *start = buf;
unsigned long reg, value;
int step = 1;
struct snd_soc_device *devdata = file->private_data;
struct snd_soc_codec *codec = devdata->codec;
struct snd_soc_codec *codec = file->private_data;

buf_size = min(count, (sizeof(buf)-1));
if (copy_from_user(buf, user_buf, buf_size))
Expand Down Expand Up @@ -1051,44 +1056,36 @@ static const struct file_operations codec_reg_fops = {
.write = codec_reg_write_file,
};

static void soc_init_debugfs(struct snd_soc_device *socdev)
static void soc_init_codec_debugfs(struct snd_soc_codec *codec)
{
struct dentry *root, *file;
struct snd_soc_codec *codec = socdev->codec;
root = debugfs_create_dir(dev_name(socdev->dev), NULL);
if (IS_ERR(root) || !root)
goto exit1;

file = debugfs_create_file("codec_reg", 0644,
root, socdev, &codec_reg_fops);
if (!file)
goto exit2;

file = debugfs_create_u32("dapm_pop_time", 0744,
root, &codec->pop_time);
if (!file)
goto exit2;
socdev->debugfs_root = root;
return;
exit2:
debugfs_remove_recursive(root);
exit1:
dev_err(socdev->dev, "debugfs is not available\n");
codec->debugfs_reg = debugfs_create_file("codec_reg", 0644,
debugfs_root, codec,
&codec_reg_fops);
if (!codec->debugfs_reg)
printk(KERN_WARNING
"ASoC: Failed to create codec register debugfs file\n");

codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744,
debugfs_root,
&codec->pop_time);
if (!codec->debugfs_pop_time)
printk(KERN_WARNING
"Failed to create pop time debugfs file\n");
}

static void soc_cleanup_debugfs(struct snd_soc_device *socdev)
static void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec)
{
debugfs_remove_recursive(socdev->debugfs_root);
socdev->debugfs_root = NULL;
debugfs_remove(codec->debugfs_pop_time);
debugfs_remove(codec->debugfs_reg);
}

#else

static inline void soc_init_debugfs(struct snd_soc_device *socdev)
static inline void soc_init_codec_debugfs(struct snd_soc_codec *codec)
{
}

static inline void soc_cleanup_debugfs(struct snd_soc_device *socdev)
static inline void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec)
{
}
#endif
Expand Down Expand Up @@ -1305,7 +1302,7 @@ int snd_soc_init_card(struct snd_soc_device *socdev)
if (err < 0)
printk(KERN_WARNING "asoc: failed to add codec sysfs files\n");

soc_init_debugfs(socdev);
soc_init_codec_debugfs(socdev->codec);
mutex_unlock(&codec->mutex);

out:
Expand All @@ -1329,7 +1326,7 @@ void snd_soc_free_pcms(struct snd_soc_device *socdev)
#endif

mutex_lock(&codec->mutex);
soc_cleanup_debugfs(socdev);
soc_cleanup_codec_debugfs(socdev->codec);
#ifdef CONFIG_SND_SOC_AC97_BUS
for (i = 0; i < codec->num_dai; i++) {
codec_dai = &codec->dai[i];
Expand Down Expand Up @@ -1962,11 +1959,23 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_digital_mute);

static int __devinit snd_soc_init(void)
{
#ifdef CONFIG_DEBUG_FS
debugfs_root = debugfs_create_dir("asoc", NULL);
if (IS_ERR(debugfs_root) || !debugfs_root) {
printk(KERN_WARNING
"ASoC: Failed to create debugfs directory\n");
debugfs_root = NULL;
}
#endif

return platform_driver_register(&soc_driver);
}

static void __exit snd_soc_exit(void)
{
#ifdef CONFIG_DEBUG_FS
debugfs_remove_recursive(debugfs_root);
#endif
platform_driver_unregister(&soc_driver);
}

Expand Down

0 comments on commit 384c89e

Please sign in to comment.