aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-10-10 11:51:55 +0200
committerJaroslav Kysela <perex@suse.cz>2005-11-04 13:17:54 +0100
commit93f2e37840a9a7c3693ca6961fe6ad46b250f3b9 (patch)
tree66cfaa7602ec0541f667a55f8de69a42df75db87
parent07799e756c76ecd52cb01a812ba48b7d8ac67633 (diff)
[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>
-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 fa8f4c9492c..af314205635 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);
/* 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 1a81fe4df21..11a7675b719 100644
--- 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 842c28b2ed5..c57f702d31a 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,
}
+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 b57519a3e3d..bc8ad001798 100644
--- 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