aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/core.h1
-rw-r--r--sound/core/misc.c11
-rw-r--r--sound/core/oss/pcm_oss.c11
-rw-r--r--sound/core/sound.c1
4 files changed, 11 insertions, 13 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index fa8f4c9492cc..af314205635d 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -373,7 +373,6 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size);
373 373
374/* misc.c */ 374/* misc.c */
375 375
376int snd_task_name(struct task_struct *task, char *name, size_t size);
377#ifdef CONFIG_SND_VERBOSE_PRINTK 376#ifdef CONFIG_SND_VERBOSE_PRINTK
378void snd_verbose_printk(const char *file, int line, const char *format, ...) 377void snd_verbose_printk(const char *file, int line, const char *format, ...)
379 __attribute__ ((format (printf, 3, 4))); 378 __attribute__ ((format (printf, 3, 4)));
diff --git a/sound/core/misc.c b/sound/core/misc.c
index 1a81fe4df218..11a7675b719b 100644
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -25,17 +25,6 @@
25#include <linux/time.h> 25#include <linux/time.h>
26#include <sound/core.h> 26#include <sound/core.h>
27 27
28int snd_task_name(struct task_struct *task, char *name, size_t size)
29{
30 unsigned int idx;
31
32 snd_assert(task != NULL && name != NULL && size >= 2, return -EINVAL);
33 for (idx = 0; idx < sizeof(task->comm) && idx + 1 < size; idx++)
34 name[idx] = task->comm[idx];
35 name[idx] = '\0';
36 return 0;
37}
38
39#ifdef CONFIG_SND_VERBOSE_PRINTK 28#ifdef CONFIG_SND_VERBOSE_PRINTK
40void snd_verbose_printk(const char *file, int line, const char *format, ...) 29void snd_verbose_printk(const char *file, int line, const char *format, ...)
41{ 30{
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 842c28b2ed55..c57f702d31a7 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1821,6 +1821,17 @@ static int snd_pcm_oss_open_file(struct file *file,
1821} 1821}
1822 1822
1823 1823
1824static int snd_task_name(struct task_struct *task, char *name, size_t size)
1825{
1826 unsigned int idx;
1827
1828 snd_assert(task != NULL && name != NULL && size >= 2, return -EINVAL);
1829 for (idx = 0; idx < sizeof(task->comm) && idx + 1 < size; idx++)
1830 name[idx] = task->comm[idx];
1831 name[idx] = '\0';
1832 return 0;
1833}
1834
1824static int snd_pcm_oss_open(struct inode *inode, struct file *file) 1835static int snd_pcm_oss_open(struct inode *inode, struct file *file)
1825{ 1836{
1826 int minor = iminor(inode); 1837 int minor = iminor(inode);
diff --git a/sound/core/sound.c b/sound/core/sound.c
index b57519a3e3d9..bc8ad0017984 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -487,7 +487,6 @@ EXPORT_SYMBOL(snd_ctl_unregister_ioctl_compat);
487EXPORT_SYMBOL(snd_ctl_elem_read); 487EXPORT_SYMBOL(snd_ctl_elem_read);
488EXPORT_SYMBOL(snd_ctl_elem_write); 488EXPORT_SYMBOL(snd_ctl_elem_write);
489 /* misc.c */ 489 /* misc.c */
490EXPORT_SYMBOL(snd_task_name);
491#ifdef CONFIG_SND_VERBOSE_PRINTK 490#ifdef CONFIG_SND_VERBOSE_PRINTK
492EXPORT_SYMBOL(snd_verbose_printk); 491EXPORT_SYMBOL(snd_verbose_printk);
493#endif 492#endif