[ALSA] Make snd_task_name() module local

Modules: ALSA Core,ALSA<-OSS emulation

Remove a global function snd_task_name(), and move it local
to snd-pcm-oss module.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/core.h b/include/sound/core.h
index fa8f4c9492ccbe4fa2119cd25bbe2f782684e3fe..af314205635d12afe11a40130766a859d3bf3f4f 100644 (file)
--- 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);
 
 /* misc.c */
 
-int snd_task_name(struct task_struct *task, char *name, size_t size);
 #ifdef CONFIG_SND_VERBOSE_PRINTK
 void snd_verbose_printk(const char *file, int line, const char *format, ...)
      __attribute__ ((format (printf, 3, 4)));

diff --git a/sound/core/misc.c b/sound/core/misc.c
index 1a81fe4df218b2a47c7428d7b5225bc6b1ad8446..11a7675b719b952665d1217d5f8c389fcd301d41 100644 (file)
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -25,17 +25,6 @@
 #include <linux/time.h>
 #include <sound/core.h>
 
-int snd_task_name(struct task_struct *task, char *name, size_t size)
-{
-       unsigned int idx;
-
-       snd_assert(task != NULL && name != NULL && size >= 2, return -EINVAL);
-       for (idx = 0; idx < sizeof(task->comm) && idx + 1 < size; idx++)
-               name[idx] = task->comm[idx];
-       name[idx] = '\0';
-       return 0;
-}
-
 #ifdef CONFIG_SND_VERBOSE_PRINTK
 void snd_verbose_printk(const char *file, int line, const char *format, ...)
 {

diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 842c28b2ed55cfad9266cd3e0245fe2f4648892d..c57f702d31a7529be73c2c7a58fd114f50865333 100644 (file)
--- 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,
 }
 
 
+static int snd_task_name(struct task_struct *task, char *name, size_t size)
+{
+       unsigned int idx;
+
+       snd_assert(task != NULL && name != NULL && size >= 2, return -EINVAL);
+       for (idx = 0; idx < sizeof(task->comm) && idx + 1 < size; idx++)
+               name[idx] = task->comm[idx];
+       name[idx] = '\0';
+       return 0;
+}
+
 static int snd_pcm_oss_open(struct inode *inode, struct file *file)
 {
        int minor = iminor(inode);

diff --git a/sound/core/sound.c b/sound/core/sound.c
index b57519a3e3d90058135dc2781cbf72e14a36acd9..bc8ad00179847bc9ea9977198978cbe419f48bef 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -487,7 +487,6 @@ EXPORT_SYMBOL(snd_ctl_unregister_ioctl_compat);
 EXPORT_SYMBOL(snd_ctl_elem_read);
 EXPORT_SYMBOL(snd_ctl_elem_write);
   /* misc.c */
-EXPORT_SYMBOL(snd_task_name);
 #ifdef CONFIG_SND_VERBOSE_PRINTK
 EXPORT_SYMBOL(snd_verbose_printk);
 #endif