diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-10-10 05:51:55 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:17:54 -0500 |
| commit | 93f2e37840a9a7c3693ca6961fe6ad46b250f3b9 (patch) | |
| tree | 66cfaa7602ec0541f667a55f8de69a42df75db87 /sound | |
| parent | 07799e756c76ecd52cb01a812ba48b7d8ac67633 (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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/misc.c | 11 | ||||
| -rw-r--r-- | sound/core/oss/pcm_oss.c | 11 | ||||
| -rw-r--r-- | sound/core/sound.c | 1 |
3 files changed, 11 insertions, 12 deletions
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 | ||
| 28 | int 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 |
| 40 | void snd_verbose_printk(const char *file, int line, const char *format, ...) | 29 | void 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 | ||
| 1824 | static 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 | |||
| 1824 | static int snd_pcm_oss_open(struct inode *inode, struct file *file) | 1835 | static 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); | |||
| 487 | EXPORT_SYMBOL(snd_ctl_elem_read); | 487 | EXPORT_SYMBOL(snd_ctl_elem_read); |
| 488 | EXPORT_SYMBOL(snd_ctl_elem_write); | 488 | EXPORT_SYMBOL(snd_ctl_elem_write); |
| 489 | /* misc.c */ | 489 | /* misc.c */ |
| 490 | EXPORT_SYMBOL(snd_task_name); | ||
| 491 | #ifdef CONFIG_SND_VERBOSE_PRINTK | 490 | #ifdef CONFIG_SND_VERBOSE_PRINTK |
| 492 | EXPORT_SYMBOL(snd_verbose_printk); | 491 | EXPORT_SYMBOL(snd_verbose_printk); |
| 493 | #endif | 492 | #endif |
