Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: remove CONFIG_KMOD from sound

Browse Source 
A bunch of things in alsa depend on CONFIG_KMOD,
use CONFIG_MODULES instead where the dependency
is needed at all.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Johannes Berg 2008-07-09 10:28:41 +02:00 committed by Jaroslav Kysela
parent 7fc077fba5
commit ee2da99782
7 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/seq_kernel.h
View File

@ -105,7 +105,7 @@ int snd_seq_event_port_attach(int client, struct snd_seq_port_callback *pcbp,
int cap, int type, int midi_channels, int midi_voices, char *portname); int cap, int type, int midi_channels, int midi_voices, char *portname);
int snd_seq_event_port_detach(int client, int port); int snd_seq_event_port_detach(int client, int port);
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
void snd_seq_autoload_lock(void); void snd_seq_autoload_lock(void);
void snd_seq_autoload_unlock(void); void snd_seq_autoload_unlock(void);
#else #else

2
sound/core/seq/seq_clientmgr.c
View File

@ -148,7 +148,7 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid)
return NULL; return NULL;
} }
spin_unlock_irqrestore(&clients_lock, flags); spin_unlock_irqrestore(&clients_lock, flags);
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
if (!in_interrupt()) { if (!in_interrupt()) {
static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS]; static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS];
static char card_requested[SNDRV_CARDS]; static char card_requested[SNDRV_CARDS];

6
sound/core/seq/seq_device.c
View File

@ -124,7 +124,7 @@ static void snd_seq_device_info(struct snd_info_entry *entry,
* load all registered drivers (called from seq_clientmgr.c) * load all registered drivers (called from seq_clientmgr.c)
*/ */
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
/* avoid auto-loading during module_init() */ /* avoid auto-loading during module_init() */
static int snd_seq_in_init; static int snd_seq_in_init;
void snd_seq_autoload_lock(void) void snd_seq_autoload_lock(void)
@ -140,7 +140,7 @@ void snd_seq_autoload_unlock(void)
void snd_seq_device_load_drivers(void) void snd_seq_device_load_drivers(void)
{ {
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
struct ops_list *ops; struct ops_list *ops;
/* Calling request_module during module_init() /* Calling request_module during module_init()
@ -566,7 +566,5 @@ EXPORT_SYMBOL(snd_seq_device_load_drivers);
EXPORT_SYMBOL(snd_seq_device_new); EXPORT_SYMBOL(snd_seq_device_new);
EXPORT_SYMBOL(snd_seq_device_register_driver); EXPORT_SYMBOL(snd_seq_device_register_driver);
EXPORT_SYMBOL(snd_seq_device_unregister_driver); EXPORT_SYMBOL(snd_seq_device_unregister_driver);
#ifdef CONFIG_KMOD
EXPORT_SYMBOL(snd_seq_autoload_lock); EXPORT_SYMBOL(snd_seq_autoload_lock);
EXPORT_SYMBOL(snd_seq_autoload_unlock); EXPORT_SYMBOL(snd_seq_autoload_unlock);
#endif

8
sound/core/sound.c
View File

@ -60,14 +60,14 @@ 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);
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
/** /**
* snd_request_card - try to load the card module * snd_request_card - try to load the card module
* @card: the card number * @card: the card number
* *
* Tries to load the module "snd-card-X" for the given card number * Tries to load the module "snd-card-X" for the given card number
* via KMOD. Returns immediately if already loaded. * via request_module. Returns immediately if already loaded.
*/ */
void snd_request_card(int card) void snd_request_card(int card)
{ {
@ -92,7 +92,7 @@ static void snd_request_other(int minor)
request_module(str); request_module(str);
} }
#endif /* request_module support */ #endif /* modular kernel */
/** /**
* snd_lookup_minor_data - get user data of a registered device * snd_lookup_minor_data - get user data of a registered device
@ -132,7 +132,7 @@ static int snd_open(struct inode *inode, struct file *file)
return -ENODEV; return -ENODEV;
mptr = snd_minors[minor]; mptr = snd_minors[minor];
if (mptr == NULL) { if (mptr == NULL) {
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
int dev = SNDRV_MINOR_DEVICE(minor); int dev = SNDRV_MINOR_DEVICE(minor);
if (dev == SNDRV_MINOR_CONTROL) { if (dev == SNDRV_MINOR_CONTROL) {
/* /dev/aloadC? */ /* /dev/aloadC? */

6
sound/core/timer.c
View File

@ -146,7 +146,7 @@ static struct snd_timer *snd_timer_find(struct snd_timer_id *tid)
return NULL; return NULL;
} }
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
static void snd_timer_request(struct snd_timer_id *tid) static void snd_timer_request(struct snd_timer_id *tid)
{ {
@ -259,8 +259,8 @@ int snd_timer_open(struct snd_timer_instance **ti,
/* open a master instance */ /* open a master instance */
mutex_lock(&register_mutex); mutex_lock(&register_mutex);
timer = snd_timer_find(tid); timer = snd_timer_find(tid);
#ifdef CONFIG_KMOD #ifdef CONFIG_MODULES
if (timer == NULL) { if (!timer) {
mutex_unlock(&register_mutex); mutex_unlock(&register_mutex);
snd_timer_request(tid); snd_timer_request(tid);
mutex_lock(&register_mutex); mutex_lock(&register_mutex);

2
sound/ppc/daca.c
View File

@ -249,9 +249,7 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip)
int i, err; int i, err;
struct pmac_daca *mix; struct pmac_daca *mix;
#ifdef CONFIG_KMOD
request_module("i2c-powermac"); request_module("i2c-powermac");
#endif /* CONFIG_KMOD */
mix = kzalloc(sizeof(*mix), GFP_KERNEL); mix = kzalloc(sizeof(*mix), GFP_KERNEL);
if (! mix) if (! mix)

2
sound/ppc/tumbler.c
View File

@ -1350,9 +1350,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
struct device_node *tas_node, *np; struct device_node *tas_node, *np;
char *chipname; char *chipname;
#ifdef CONFIG_KMOD
request_module("i2c-powermac"); request_module("i2c-powermac");
#endif /* CONFIG_KMOD */
mix = kzalloc(sizeof(*mix), GFP_KERNEL); mix = kzalloc(sizeof(*mix), GFP_KERNEL);
if (! mix) if (! mix)