Commit 93f2e378 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[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: default avatarTakashi Iwai <tiwai@suse.de>
parent 07799e75

include/sound/core.h

+0 −1
Original line number Diff line number Diff line
@@ -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)));

sound/core/misc.c

+0 −11
Original line number Diff line number Diff line
@@ -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, ...)

{

sound/core/oss/pcm_oss.c

+11 −0
Original line number Diff line number Diff line
@@ -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);

sound/core/sound.c

+0 −1
Original line number Diff line number Diff line
@@ -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