Skip to content

L
linux-davinci-2.6.23
Commit c0d3fb39 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Clean up EXPORT_SYMBOL()s in snd module 

Move EXPORT_SYMBOL()s to places adjacent to functions/variables.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9bb22e21
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 88 deletions
sound/core/control.c
View file @ c0d3fb39
...@@ -176,6 +176,8 @@ void snd_ctl_notify(struct snd_card *card, unsigned int mask, ...@@ -176,6 +176,8 @@ void snd_ctl_notify(struct snd_card *card, unsigned int mask,
read_unlock(&card->ctl_files_rwlock); read_unlock(&card->ctl_files_rwlock);
} }
EXPORT_SYMBOL(snd_ctl_notify);
/** /**
* snd_ctl_new - create a control instance from the template * snd_ctl_new - create a control instance from the template
* @control: the control template * @control: the control template
...@@ -204,6 +206,8 @@ struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control, unsigned int acce ...@@ -204,6 +206,8 @@ struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control, unsigned int acce
return kctl; return kctl;
} }
EXPORT_SYMBOL(snd_ctl_new);
/** /**
* snd_ctl_new1 - create a control instance from the template * snd_ctl_new1 - create a control instance from the template
* @ncontrol: the initialization record * @ncontrol: the initialization record
...@@ -242,6 +246,8 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol, ...@@ -242,6 +246,8 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol,
return snd_ctl_new(&kctl, access); return snd_ctl_new(&kctl, access);
} }
EXPORT_SYMBOL(snd_ctl_new1);
/** /**
* snd_ctl_free_one - release the control instance * snd_ctl_free_one - release the control instance
* @kcontrol: the control instance * @kcontrol: the control instance
...@@ -259,6 +265,8 @@ void snd_ctl_free_one(struct snd_kcontrol *kcontrol) ...@@ -259,6 +265,8 @@ void snd_ctl_free_one(struct snd_kcontrol *kcontrol)
} }
} }
EXPORT_SYMBOL(snd_ctl_free_one);
static unsigned int snd_ctl_hole_check(struct snd_card *card, static unsigned int snd_ctl_hole_check(struct snd_card *card,
unsigned int count) unsigned int count)
{ {
...@@ -347,6 +355,8 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol) ...@@ -347,6 +355,8 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
return err; return err;
} }
EXPORT_SYMBOL(snd_ctl_add);
/** /**
* snd_ctl_remove - remove the control from the card and release it * snd_ctl_remove - remove the control from the card and release it
* @card: the card instance * @card: the card instance
...@@ -373,6 +383,8 @@ int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol) ...@@ -373,6 +383,8 @@ int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_ctl_remove);
/** /**
* snd_ctl_remove_id - remove the control of the given id and release it * snd_ctl_remove_id - remove the control of the given id and release it
* @card: the card instance * @card: the card instance
...@@ -399,6 +411,8 @@ int snd_ctl_remove_id(struct snd_card *card, struct snd_ctl_elem_id *id) ...@@ -399,6 +411,8 @@ int snd_ctl_remove_id(struct snd_card *card, struct snd_ctl_elem_id *id)
return ret; return ret;
} }
EXPORT_SYMBOL(snd_ctl_remove_id);
/** /**
* snd_ctl_remove_unlocked_id - remove the unlocked control of the given id and release it * snd_ctl_remove_unlocked_id - remove the unlocked control of the given id and release it
* @file: active control handle * @file: active control handle
...@@ -461,6 +475,8 @@ int snd_ctl_rename_id(struct snd_card *card, struct snd_ctl_elem_id *src_id, ...@@ -461,6 +475,8 @@ int snd_ctl_rename_id(struct snd_card *card, struct snd_ctl_elem_id *src_id,
return 0; return 0;
} }
EXPORT_SYMBOL(snd_ctl_rename_id);
/** /**
* snd_ctl_find_numid - find the control instance with the given number-id * snd_ctl_find_numid - find the control instance with the given number-id
* @card: the card instance * @card: the card instance
...@@ -487,6 +503,8 @@ struct snd_kcontrol *snd_ctl_find_numid(struct snd_card *card, unsigned int numi ...@@ -487,6 +503,8 @@ struct snd_kcontrol *snd_ctl_find_numid(struct snd_card *card, unsigned int numi
return NULL; return NULL;
} }
EXPORT_SYMBOL(snd_ctl_find_numid);
/** /**
* snd_ctl_find_id - find the control instance with the given id * snd_ctl_find_id - find the control instance with the given id
* @card: the card instance * @card: the card instance
...@@ -527,6 +545,8 @@ struct snd_kcontrol *snd_ctl_find_id(struct snd_card *card, ...@@ -527,6 +545,8 @@ struct snd_kcontrol *snd_ctl_find_id(struct snd_card *card,
return NULL; return NULL;
} }
EXPORT_SYMBOL(snd_ctl_find_id);
static int snd_ctl_card_info(struct snd_card *card, struct snd_ctl_file * ctl, static int snd_ctl_card_info(struct snd_card *card, struct snd_ctl_file * ctl,
unsigned int cmd, void __user *arg) unsigned int cmd, void __user *arg)
{ {
...@@ -704,6 +724,8 @@ int snd_ctl_elem_read(struct snd_card *card, struct snd_ctl_elem_value *control) ...@@ -704,6 +724,8 @@ int snd_ctl_elem_read(struct snd_card *card, struct snd_ctl_elem_value *control)
return result; return result;
} }
EXPORT_SYMBOL(snd_ctl_elem_read);
static int snd_ctl_elem_read_user(struct snd_card *card, static int snd_ctl_elem_read_user(struct snd_card *card,
struct snd_ctl_elem_value __user *_control) struct snd_ctl_elem_value __user *_control)
{ {
...@@ -767,6 +789,8 @@ int snd_ctl_elem_write(struct snd_card *card, struct snd_ctl_file *file, ...@@ -767,6 +789,8 @@ int snd_ctl_elem_write(struct snd_card *card, struct snd_ctl_file *file,
return result; return result;
} }
EXPORT_SYMBOL(snd_ctl_elem_write);
static int snd_ctl_elem_write_user(struct snd_ctl_file *file, static int snd_ctl_elem_write_user(struct snd_ctl_file *file,
struct snd_ctl_elem_value __user *_control) struct snd_ctl_elem_value __user *_control)
{ {
...@@ -1199,11 +1223,15 @@ int snd_ctl_register_ioctl(snd_kctl_ioctl_func_t fcn) ...@@ -1199,11 +1223,15 @@ int snd_ctl_register_ioctl(snd_kctl_ioctl_func_t fcn)
return _snd_ctl_register_ioctl(fcn, &snd_control_ioctls); return _snd_ctl_register_ioctl(fcn, &snd_control_ioctls);
} }
EXPORT_SYMBOL(snd_ctl_register_ioctl);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
int snd_ctl_register_ioctl_compat(snd_kctl_ioctl_func_t fcn) int snd_ctl_register_ioctl_compat(snd_kctl_ioctl_func_t fcn)
{ {
return _snd_ctl_register_ioctl(fcn, &snd_control_compat_ioctls); return _snd_ctl_register_ioctl(fcn, &snd_control_compat_ioctls);
} }
EXPORT_SYMBOL(snd_ctl_register_ioctl_compat);
#endif #endif
/* /*
...@@ -1236,12 +1264,15 @@ int snd_ctl_unregister_ioctl(snd_kctl_ioctl_func_t fcn) ...@@ -1236,12 +1264,15 @@ int snd_ctl_unregister_ioctl(snd_kctl_ioctl_func_t fcn)
return _snd_ctl_unregister_ioctl(fcn, &snd_control_ioctls); return _snd_ctl_unregister_ioctl(fcn, &snd_control_ioctls);
} }
EXPORT_SYMBOL(snd_ctl_unregister_ioctl);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
int snd_ctl_unregister_ioctl_compat(snd_kctl_ioctl_func_t fcn) int snd_ctl_unregister_ioctl_compat(snd_kctl_ioctl_func_t fcn)
{ {
return _snd_ctl_unregister_ioctl(fcn, &snd_control_compat_ioctls); return _snd_ctl_unregister_ioctl(fcn, &snd_control_compat_ioctls);
} }
EXPORT_SYMBOL(snd_ctl_unregister_ioctl_compat);
#endif #endif
static int snd_ctl_fasync(int fd, struct file * file, int on) static int snd_ctl_fasync(int fd, struct file * file, int on)
......
sound/core/device.c
View file @ c0d3fb39
...@@ -63,6 +63,8 @@ int snd_device_new(struct snd_card *card, snd_device_type_t type, ...@@ -63,6 +63,8 @@ int snd_device_new(struct snd_card *card, snd_device_type_t type,
return 0; return 0;
} }
EXPORT_SYMBOL(snd_device_new);
/** /**
* snd_device_free - release the device from the card * snd_device_free - release the device from the card
* @card: the card instance * @card: the card instance
...@@ -107,6 +109,8 @@ int snd_device_free(struct snd_card *card, void *device_data) ...@@ -107,6 +109,8 @@ int snd_device_free(struct snd_card *card, void *device_data)
return -ENXIO; return -ENXIO;
} }
EXPORT_SYMBOL(snd_device_free);
/** /**
* snd_device_disconnect - disconnect the device * snd_device_disconnect - disconnect the device
* @card: the card instance * @card: the card instance
...@@ -182,6 +186,8 @@ int snd_device_register(struct snd_card *card, void *device_data) ...@@ -182,6 +186,8 @@ int snd_device_register(struct snd_card *card, void *device_data)
return -ENXIO; return -ENXIO;
} }
EXPORT_SYMBOL(snd_device_register);
/* /*
* register all the devices on the card. * register all the devices on the card.
* called from init.c * called from init.c
......
sound/core/info.c
View file @ c0d3fb39
...@@ -111,12 +111,16 @@ int snd_iprintf(struct snd_info_buffer *buffer, char *fmt,...) ...@@ -111,12 +111,16 @@ int snd_iprintf(struct snd_info_buffer *buffer, char *fmt,...)
return res; return res;
} }
EXPORT_SYMBOL(snd_iprintf);
/* /*
*/ */
static struct proc_dir_entry *snd_proc_root = NULL; static struct proc_dir_entry *snd_proc_root = NULL;
struct snd_info_entry *snd_seq_root = NULL; struct snd_info_entry *snd_seq_root = NULL;
EXPORT_SYMBOL(snd_seq_root);
#ifdef CONFIG_SND_OSSEMUL #ifdef CONFIG_SND_OSSEMUL
struct snd_info_entry *snd_oss_root = NULL; struct snd_info_entry *snd_oss_root = NULL;
#endif #endif
...@@ -687,6 +691,8 @@ int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len) ...@@ -687,6 +691,8 @@ int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_info_get_line);
/** /**
* snd_info_get_str - parse a string token * snd_info_get_str - parse a string token
* @dest: the buffer to store the string token * @dest: the buffer to store the string token
...@@ -723,6 +729,8 @@ char *snd_info_get_str(char *dest, char *src, int len) ...@@ -723,6 +729,8 @@ char *snd_info_get_str(char *dest, char *src, int len)
return src; return src;
} }
EXPORT_SYMBOL(snd_info_get_str);
/** /**
* snd_info_create_entry - create an info entry * snd_info_create_entry - create an info entry
* @name: the proc file name * @name: the proc file name
...@@ -774,6 +782,8 @@ struct snd_info_entry *snd_info_create_module_entry(struct module * module, ...@@ -774,6 +782,8 @@ struct snd_info_entry *snd_info_create_module_entry(struct module * module,
return entry; return entry;
} }
EXPORT_SYMBOL(snd_info_create_module_entry);
/** /**
* snd_info_create_card_entry - create an info entry for the given card * snd_info_create_card_entry - create an info entry for the given card
* @card: the card instance * @card: the card instance
...@@ -797,6 +807,8 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card, ...@@ -797,6 +807,8 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,
return entry; return entry;
} }
EXPORT_SYMBOL(snd_info_create_card_entry);
static int snd_info_dev_free_entry(struct snd_device *device) static int snd_info_dev_free_entry(struct snd_device *device)
{ {
struct snd_info_entry *entry = device->device_data; struct snd_info_entry *entry = device->device_data;
...@@ -867,6 +879,8 @@ int snd_card_proc_new(struct snd_card *card, const char *name, ...@@ -867,6 +879,8 @@ int snd_card_proc_new(struct snd_card *card, const char *name,
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_proc_new);
/** /**
* snd_info_free_entry - release the info entry * snd_info_free_entry - release the info entry
* @entry: the info entry * @entry: the info entry
...@@ -883,6 +897,8 @@ void snd_info_free_entry(struct snd_info_entry * entry) ...@@ -883,6 +897,8 @@ void snd_info_free_entry(struct snd_info_entry * entry)
kfree(entry); kfree(entry);
} }
EXPORT_SYMBOL(snd_info_free_entry);
/** /**
* snd_info_register - register the info entry * snd_info_register - register the info entry
* @entry: the info entry * @entry: the info entry
...@@ -913,6 +929,8 @@ int snd_info_register(struct snd_info_entry * entry) ...@@ -913,6 +929,8 @@ int snd_info_register(struct snd_info_entry * entry)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_info_register);
/** /**
* snd_info_unregister - de-register the info entry * snd_info_unregister - de-register the info entry
* @entry: the info entry * @entry: the info entry
...@@ -937,6 +955,8 @@ int snd_info_unregister(struct snd_info_entry * entry) ...@@ -937,6 +955,8 @@ int snd_info_unregister(struct snd_info_entry * entry)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_info_unregister);
/* /*
*/ */
......
sound/core/info_oss.c
View file @ c0d3fb39
...@@ -64,6 +64,8 @@ int snd_oss_info_register(int dev, int num, char *string) ...@@ -64,6 +64,8 @@ int snd_oss_info_register(int dev, int num, char *string)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_oss_info_register);
extern void snd_card_info_read_oss(struct snd_info_buffer *buffer); extern void snd_card_info_read_oss(struct snd_info_buffer *buffer);
static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev) static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev)
......
sound/core/init.c
View file @ c0d3fb39
...@@ -40,10 +40,13 @@ struct snd_shutdown_f_ops { ...@@ -40,10 +40,13 @@ struct snd_shutdown_f_ops {
unsigned int snd_cards_lock = 0; /* locked for registering/using */ unsigned int snd_cards_lock = 0; /* locked for registering/using */
struct snd_card *snd_cards[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = NULL}; struct snd_card *snd_cards[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = NULL};
EXPORT_SYMBOL(snd_cards);
DEFINE_RWLOCK(snd_card_rwlock); DEFINE_RWLOCK(snd_card_rwlock);
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE) #if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int free_flag); int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int free_flag);
EXPORT_SYMBOL(snd_mixer_oss_notify_callback);
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
...@@ -169,6 +172,8 @@ struct snd_card *snd_card_new(int idx, const char *xid, ...@@ -169,6 +172,8 @@ struct snd_card *snd_card_new(int idx, const char *xid,
return NULL; return NULL;
} }
EXPORT_SYMBOL(snd_card_new);
static loff_t snd_disconnect_llseek(struct file *file, loff_t offset, int orig) static loff_t snd_disconnect_llseek(struct file *file, loff_t offset, int orig)
{ {
return -ENODEV; return -ENODEV;
...@@ -298,6 +303,8 @@ int snd_card_disconnect(struct snd_card *card) ...@@ -298,6 +303,8 @@ int snd_card_disconnect(struct snd_card *card)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_disconnect);
/** /**
* snd_card_free - frees given soundcard structure * snd_card_free - frees given soundcard structure
* @card: soundcard structure * @card: soundcard structure
...@@ -360,6 +367,8 @@ int snd_card_free(struct snd_card *card) ...@@ -360,6 +367,8 @@ int snd_card_free(struct snd_card *card)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_free);
static void snd_card_free_thread(void * __card) static void snd_card_free_thread(void * __card)
{ {
struct snd_card *card = __card; struct snd_card *card = __card;
...@@ -405,6 +414,8 @@ int snd_card_free_in_thread(struct snd_card *card) ...@@ -405,6 +414,8 @@ int snd_card_free_in_thread(struct snd_card *card)
return -EFAULT; return -EFAULT;
} }
EXPORT_SYMBOL(snd_card_free_in_thread);
static void choose_default_id(struct snd_card *card) static void choose_default_id(struct snd_card *card)
{ {
int i, len, idx_flag = 0, loops = SNDRV_CARDS; int i, len, idx_flag = 0, loops = SNDRV_CARDS;
...@@ -505,6 +516,8 @@ int snd_card_register(struct snd_card *card) ...@@ -505,6 +516,8 @@ int snd_card_register(struct snd_card *card)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_register);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static struct snd_info_entry *snd_card_info_entry = NULL; static struct snd_info_entry *snd_card_info_entry = NULL;
...@@ -644,6 +657,8 @@ int snd_component_add(struct snd_card *card, const char *component) ...@@ -644,6 +657,8 @@ int snd_component_add(struct snd_card *card, const char *component)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_component_add);
/** /**
* snd_card_file_add - add the file to the file list of the card * snd_card_file_add - add the file to the file list of the card
* @card: soundcard structure * @card: soundcard structure
...@@ -676,6 +691,8 @@ int snd_card_file_add(struct snd_card *card, struct file *file) ...@@ -676,6 +691,8 @@ int snd_card_file_add(struct snd_card *card, struct file *file)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_file_add);
/** /**
* snd_card_file_remove - remove the file from the file list * snd_card_file_remove - remove the file from the file list
* @card: soundcard structure * @card: soundcard structure
...@@ -717,6 +734,8 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) ...@@ -717,6 +734,8 @@ int snd_card_file_remove(struct snd_card *card, struct file *file)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_card_file_remove);
#ifdef CONFIG_PM #ifdef CONFIG_PM
/** /**
* snd_power_wait - wait until the power-state is changed. * snd_power_wait - wait until the power-state is changed.
...@@ -753,4 +772,5 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state) ...@@ -753,4 +772,5 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state)
return result; return result;
} }
EXPORT_SYMBOL(snd_power_wait);
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
sound/core/isadma.c
View file @ c0d3fb39
...@@ -56,6 +56,8 @@ void snd_dma_program(unsigned long dma, ...@@ -56,6 +56,8 @@ void snd_dma_program(unsigned long dma,
release_dma_lock(flags); release_dma_lock(flags);
} }
EXPORT_SYMBOL(snd_dma_program);
/** /**
* snd_dma_disable - stop the ISA DMA transfer * snd_dma_disable - stop the ISA DMA transfer
* @dma: the dma number * @dma: the dma number
...@@ -72,6 +74,8 @@ void snd_dma_disable(unsigned long dma) ...@@ -72,6 +74,8 @@ void snd_dma_disable(unsigned long dma)
release_dma_lock(flags); release_dma_lock(flags);
} }
EXPORT_SYMBOL(snd_dma_disable);
/** /**
* snd_dma_pointer - return the current pointer to DMA transfer buffer in bytes * snd_dma_pointer - return the current pointer to DMA transfer buffer in bytes
* @dma: the dma number * @dma: the dma number
...@@ -101,3 +105,5 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size) ...@@ -101,3 +105,5 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)
else else
return size - result; return size - result;
} }
EXPORT_SYMBOL(snd_dma_pointer);
sound/core/memory.c
View file @ c0d3fb39
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -55,6 +56,8 @@ int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size ...@@ -55,6 +56,8 @@ int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size
#endif #endif
} }
EXPORT_SYMBOL(copy_to_user_fromio);
/** /**
* copy_from_user_toio - copy data from user-space to mmio-space * copy_from_user_toio - copy data from user-space to mmio-space
* @dst: the destination pointer on mmio-space * @dst: the destination pointer on mmio-space
...@@ -85,3 +88,5 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size ...@@ -85,3 +88,5 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size
return 0; return 0;
#endif #endif
} }
EXPORT_SYMBOL(copy_from_user_toio);
sound/core/misc.c
View file @ c0d3fb39
...@@ -34,6 +34,8 @@ void release_and_free_resource(struct resource *res) ...@@ -34,6 +34,8 @@ void release_and_free_resource(struct resource *res)
} }
} }
EXPORT_SYMBOL(release_and_free_resource);
#ifdef CONFIG_SND_VERBOSE_PRINTK #ifdef CONFIG_SND_VERBOSE_PRINTK
void snd_verbose_printk(const char *file, int line, const char *format, ...) void snd_verbose_printk(const char *file, int line, const char *format, ...)
{ {
...@@ -51,6 +53,8 @@ void snd_verbose_printk(const char *file, int line, const char *format, ...) ...@@ -51,6 +53,8 @@ void snd_verbose_printk(const char *file, int line, const char *format, ...)
vprintk(format, args); vprintk(format, args);
va_end(args); va_end(args);
} }
EXPORT_SYMBOL(snd_verbose_printk);
#endif #endif
#if defined(CONFIG_SND_DEBUG) && defined(CONFIG_SND_VERBOSE_PRINTK) #if defined(CONFIG_SND_DEBUG) && defined(CONFIG_SND_VERBOSE_PRINTK)
...@@ -71,4 +75,6 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...) ...@@ -71,4 +75,6 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
va_end(args); va_end(args);
} }
EXPORT_SYMBOL(snd_verbose_printd);
#endif #endif
sound/core/sound.c
View file @ c0d3fb39
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
static int major = CONFIG_SND_MAJOR; static int major = CONFIG_SND_MAJOR;
int snd_major; int snd_major;
EXPORT_SYMBOL(snd_major);
static int cards_limit = 1; static int cards_limit = 1;
static int device_mode = S_IFCHR | S_IRUGO | S_IWUGO; static int device_mode = S_IFCHR | S_IRUGO | S_IWUGO;
...@@ -60,6 +62,7 @@ MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR); ...@@ -60,6 +62,7 @@ MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
* modules are loaded manually, this limit number increases, too. * modules are loaded manually, this limit number increases, too.
*/ */
int snd_ecards_limit; int snd_ecards_limit;
EXPORT_SYMBOL(snd_ecards_limit);
static struct snd_minor *snd_minors[SNDRV_OS_MINORS]; static struct snd_minor *snd_minors[SNDRV_OS_MINORS];
static DEFINE_MUTEX(sound_mutex); static DEFINE_MUTEX(sound_mutex);
...@@ -92,6 +95,8 @@ void snd_request_card(int card) ...@@ -92,6 +95,8 @@ void snd_request_card(int card)
request_module("snd-card-%i", card); request_module("snd-card-%i", card);
} }
EXPORT_SYMBOL(snd_request_card);
static void snd_request_other(int minor) static void snd_request_other(int minor)
{ {
char *str; char *str;
...@@ -133,6 +138,8 @@ void *snd_lookup_minor_data(unsigned int minor, int type) ...@@ -133,6 +138,8 @@ void *snd_lookup_minor_data(unsigned int minor, int type)
return private_data; return private_data;
} }
EXPORT_SYMBOL(snd_lookup_minor_data);
static int snd_open(struct inode *inode, struct file *file) static int snd_open(struct inode *inode, struct file *file)
{ {
unsigned int minor = iminor(inode); unsigned int minor = iminor(inode);
...@@ -281,6 +288,8 @@ int snd_register_device(int type, struct snd_card *card, int dev, ...@@ -281,6 +288,8 @@ int snd_register_device(int type, struct snd_card *card, int dev,
return 0; return 0;
} }
EXPORT_SYMBOL(snd_register_device);
/** /**
* snd_unregister_device - unregister the device on the given card * snd_unregister_device - unregister the device on the given card
* @type: the device type, SNDRV_DEVICE_TYPE_XXX * @type: the device type, SNDRV_DEVICE_TYPE_XXX
...@@ -321,6 +330,8 @@ int snd_unregister_device(int type, struct snd_card *card, int dev) ...@@ -321,6 +330,8 @@ int snd_unregister_device(int type, struct snd_card *card, int dev)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_unregister_device);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
/* /*
* INFO PART * INFO PART
...@@ -446,91 +457,3 @@ static void __exit alsa_sound_exit(void) ...@@ -446,91 +457,3 @@ static void __exit alsa_sound_exit(void)
module_init(alsa_sound_init) module_init(alsa_sound_init)
module_exit(alsa_sound_exit) module_exit(alsa_sound_exit)
/* sound.c */
EXPORT_SYMBOL(snd_major);
EXPORT_SYMBOL(snd_ecards_limit);
#if defined(CONFIG_KMOD)
EXPORT_SYMBOL(snd_request_card);
#endif
EXPORT_SYMBOL(snd_register_device);
EXPORT_SYMBOL(snd_unregister_device);
EXPORT_SYMBOL(snd_lookup_minor_data);
#if defined(CONFIG_SND_OSSEMUL)
EXPORT_SYMBOL(snd_register_oss_device);
EXPORT_SYMBOL(snd_unregister_oss_device);
EXPORT_SYMBOL(snd_lookup_oss_minor_data);
#endif
/* memory.c */
EXPORT_SYMBOL(copy_to_user_fromio);
EXPORT_SYMBOL(copy_from_user_toio);
/* init.c */
EXPORT_SYMBOL(snd_cards);
#if defined(CONFIG_SND_MIXER_OSS) || defined(CONFIG_SND_MIXER_OSS_MODULE)
EXPORT_SYMBOL(snd_mixer_oss_notify_callback);
#endif
EXPORT_SYMBOL(snd_card_new);
EXPORT_SYMBOL(snd_card_disconnect);
EXPORT_SYMBOL(snd_card_free);
EXPORT_SYMBOL(snd_card_free_in_thread);
EXPORT_SYMBOL(snd_card_register);
EXPORT_SYMBOL(snd_component_add);
EXPORT_SYMBOL(snd_card_file_add);
EXPORT_SYMBOL(snd_card_file_remove);
#ifdef CONFIG_PM
EXPORT_SYMBOL(snd_power_wait);
#endif
/* device.c */
EXPORT_SYMBOL(snd_device_new);
EXPORT_SYMBOL(snd_device_register);
EXPORT_SYMBOL(snd_device_free);
/* isadma.c */
#ifdef CONFIG_ISA_DMA_API
EXPORT_SYMBOL(snd_dma_program);
EXPORT_SYMBOL(snd_dma_disable);
EXPORT_SYMBOL(snd_dma_pointer);
#endif
/* info.c */
#ifdef CONFIG_PROC_FS
EXPORT_SYMBOL(snd_seq_root);
EXPORT_SYMBOL(snd_iprintf);
EXPORT_SYMBOL(snd_info_get_line);
EXPORT_SYMBOL(snd_info_get_str);
EXPORT_SYMBOL(snd_info_create_module_entry);
EXPORT_SYMBOL(snd_info_create_card_entry);
EXPORT_SYMBOL(snd_info_free_entry);
EXPORT_SYMBOL(snd_info_register);
EXPORT_SYMBOL(snd_info_unregister);
EXPORT_SYMBOL(snd_card_proc_new);
#endif
/* info_oss.c */
#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
EXPORT_SYMBOL(snd_oss_info_register);
#endif
/* control.c */
EXPORT_SYMBOL(snd_ctl_new);
EXPORT_SYMBOL(snd_ctl_new1);
EXPORT_SYMBOL(snd_ctl_free_one);
EXPORT_SYMBOL(snd_ctl_add);
EXPORT_SYMBOL(snd_ctl_remove);
EXPORT_SYMBOL(snd_ctl_remove_id);
EXPORT_SYMBOL(snd_ctl_rename_id);
EXPORT_SYMBOL(snd_ctl_find_numid);
EXPORT_SYMBOL(snd_ctl_find_id);
EXPORT_SYMBOL(snd_ctl_notify);
EXPORT_SYMBOL(snd_ctl_register_ioctl);
EXPORT_SYMBOL(snd_ctl_unregister_ioctl);
#ifdef CONFIG_COMPAT
EXPORT_SYMBOL(snd_ctl_register_ioctl_compat);
EXPORT_SYMBOL(snd_ctl_unregister_ioctl_compat);
#endif
EXPORT_SYMBOL(snd_ctl_elem_read);
EXPORT_SYMBOL(snd_ctl_elem_write);
/* misc.c */
EXPORT_SYMBOL(release_and_free_resource);
#ifdef CONFIG_SND_VERBOSE_PRINTK
EXPORT_SYMBOL(snd_verbose_printk);
#endif
#if defined(CONFIG_SND_DEBUG) && defined(CONFIG_SND_VERBOSE_PRINTK)
EXPORT_SYMBOL(snd_verbose_printd);
#endif
sound/core/sound_oss.c
View file @ c0d3fb39
...@@ -58,6 +58,8 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type) ...@@ -58,6 +58,8 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type)
return private_data; return private_data;
} }
EXPORT_SYMBOL(snd_lookup_oss_minor_data);
static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev) static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
{ {
int minor; int minor;
...@@ -158,6 +160,8 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev, ...@@ -158,6 +160,8 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev,
return -EBUSY; return -EBUSY;
} }
EXPORT_SYMBOL(snd_register_oss_device);
int snd_unregister_oss_device(int type, struct snd_card *card, int dev) int snd_unregister_oss_device(int type, struct snd_card *card, int dev)
{ {
int minor = snd_oss_kernel_minor(type, card, dev); int minor = snd_oss_kernel_minor(type, card, dev);
...@@ -197,6 +201,8 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev) ...@@ -197,6 +201,8 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev)
return 0; return 0;
} }
EXPORT_SYMBOL(snd_unregister_oss_device);
/* /*
* INFO PART * INFO PART
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment