android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Push debugfs files out of the snd_soc_device structure

Browse Source 
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>
This commit is contained in:
Mark Brown 2008-12-03 17:34:03 +00:00
parent 6f2a974bfc
commit 384c89e2e4
2 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sound/soc.h
View File

@ -279,6 +279,11 @@ struct snd_soc_codec {
/* codec DAI's */ /* codec DAI's */
struct snd_soc_dai *dai; struct snd_soc_dai *dai;
unsigned int num_dai; unsigned int num_dai;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_reg;
struct dentry *debugfs_pop_time;
#endif
}; };
/* codec device */ /* codec device */
@ -364,9 +369,6 @@ struct snd_soc_device {
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
struct snd_soc_codec_device *codec_dev; struct snd_soc_codec_device *codec_dev;
void *codec_data; void *codec_data;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_root;
#endif
}; };
/* runtime channel data */ /* runtime channel data */

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

@ -39,6 +39,10 @@ static DEFINE_MUTEX(pcm_mutex);
static DEFINE_MUTEX(io_mutex); static DEFINE_MUTEX(io_mutex);
static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq); 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(). * 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. * It can be used to eliminate pops between different playback streams, e.g.
@ -1002,7 +1006,9 @@ static ssize_t codec_reg_read_file(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
ssize_t ret; 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); char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
@ -1021,8 +1027,7 @@ static ssize_t codec_reg_write_file(struct file *file,
char *start = buf; char *start = buf;
unsigned long reg, value; unsigned long reg, value;
int step = 1; int step = 1;
struct snd_soc_device *devdata = file->private_data; struct snd_soc_codec *codec = file->private_data;
struct snd_soc_codec *codec = devdata->codec;
buf_size = min(count, (sizeof(buf)-1)); buf_size = min(count, (sizeof(buf)-1));
if (copy_from_user(buf, user_buf, buf_size)) if (copy_from_user(buf, user_buf, buf_size))
@ -1051,44 +1056,36 @@ static const struct file_operations codec_reg_fops = {
.write = codec_reg_write_file, .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; codec->debugfs_reg = debugfs_create_file("codec_reg", 0644,
struct snd_soc_codec *codec = socdev->codec; debugfs_root, codec,
root = debugfs_create_dir(dev_name(socdev->dev), NULL); &codec_reg_fops);
if (IS_ERR(root) || !root) if (!codec->debugfs_reg)
goto exit1; printk(KERN_WARNING
"ASoC: Failed to create codec register debugfs file\n");
file = debugfs_create_file("codec_reg", 0644, codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744,
root, socdev, &codec_reg_fops); debugfs_root,
if (!file) &codec->pop_time);
goto exit2; if (!codec->debugfs_pop_time)
printk(KERN_WARNING
file = debugfs_create_u32("dapm_pop_time", 0744, "Failed to create pop time debugfs file\n");
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");
} }
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); debugfs_remove(codec->debugfs_pop_time);
socdev->debugfs_root = NULL; debugfs_remove(codec->debugfs_reg);
} }
#else #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 #endif
@ -1305,7 +1302,7 @@ int snd_soc_init_card(struct snd_soc_device *socdev)
if (err < 0) if (err < 0)
printk(KERN_WARNING "asoc: failed to add codec sysfs files\n"); 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); mutex_unlock(&codec->mutex);
out: out:
@ -1329,7 +1326,7 @@ void snd_soc_free_pcms(struct snd_soc_device *socdev)
#endif #endif
mutex_lock(&codec->mutex); mutex_lock(&codec->mutex);
soc_cleanup_debugfs(socdev); soc_cleanup_codec_debugfs(socdev->codec);
#ifdef CONFIG_SND_SOC_AC97_BUS #ifdef CONFIG_SND_SOC_AC97_BUS
for (i = 0; i < codec->num_dai; i++) { for (i = 0; i < codec->num_dai; i++) {
codec_dai = &codec->dai[i]; codec_dai = &codec->dai[i];
@ -1962,11 +1959,23 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_digital_mute);
static int __devinit snd_soc_init(void) 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); return platform_driver_register(&soc_driver);
} }
static void __exit snd_soc_exit(void) static void __exit snd_soc_exit(void)
{ {
#ifdef CONFIG_DEBUG_FS
debugfs_remove_recursive(debugfs_root);
#endif
platform_driver_unregister(&soc_driver); platform_driver_unregister(&soc_driver);
} }