public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: dpcm: Fixup debugFS for DPCM state.

Browse source 
Remove writable debugFS permission, use simple_open() and
fix indentation.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Liam Girdwood 2012-04-27 11:33:46 +01:00 • committed by Mark Brown
parent 604bb229b5
commit f57b8488bc
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sound/soc/soc-pcm.c
View file

@ -2241,12 +2241,6 @@ static char *dpcm_state_string(enum snd_soc_dpcm_state state)
return "unknown"; return "unknown";
} }
static int dpcm_state_open_file(struct inode *inode, struct file *file)
{
file->private_data = inode->i_private;
return 0;
}
static ssize_t dpcm_show_state(struct snd_soc_pcm_runtime *fe, static ssize_t dpcm_show_state(struct snd_soc_pcm_runtime *fe,
int stream, char *buf, size_t size) int stream, char *buf, size_t size)
{ {
@ -2324,15 +2318,14 @@ static ssize_t dpcm_state_read_file(struct file *file, char __user *user_buf,
offset += dpcm_show_state(fe, SNDRV_PCM_STREAM_CAPTURE, offset += dpcm_show_state(fe, SNDRV_PCM_STREAM_CAPTURE,
buf + offset, out_count - offset); buf + offset, out_count - offset);
ret = simple_read_from_buffer(user_buf, count, ppos, buf, offset); ret = simple_read_from_buffer(user_buf, count, ppos, buf, offset);
kfree(buf); kfree(buf);
return ret;
return ret;
} }
static const struct file_operations dpcm_state_fops = { static const struct file_operations dpcm_state_fops = {
.open = dpcm_state_open_file, .open = simple_open,
.read = dpcm_state_read_file, .read = dpcm_state_read_file,
.llseek = default_llseek, .llseek = default_llseek,
}; };
@ -2348,7 +2341,7 @@ int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
return -EINVAL; return -EINVAL;
} }
rtd->debugfs_dpcm_state = debugfs_create_file("state", 0644, rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444,
rtd->debugfs_dpcm_root, rtd->debugfs_dpcm_root,
rtd, &dpcm_state_fops); rtd, &dpcm_state_fops);