Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee2da997 authored by Johannes Berg's avatar Johannes Berg Committed by Jaroslav Kysela
Browse files

ALSA: remove CONFIG_KMOD from sound 



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

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 7fc077fb

include/sound/seq_kernel.h

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

#else

sound/core/seq/seq_clientmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid) 
		return NULL;

	}

	spin_unlock_irqrestore(&clients_lock, flags);

#ifdef CONFIG_KMOD

#ifdef CONFIG_MODULES

	if (!in_interrupt()) {

		static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS];

		static char card_requested[SNDRV_CARDS];

sound/core/seq/seq_device.c

+2 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void snd_seq_device_info(struct snd_info_entry *entry, 
 * load all registered drivers (called from seq_clientmgr.c)

 */



#ifdef CONFIG_KMOD

#ifdef CONFIG_MODULES

/* avoid auto-loading during module_init() */

static int snd_seq_in_init;

void snd_seq_autoload_lock(void)
@@ -140,7 +140,7 @@ void snd_seq_autoload_unlock(void) 


void snd_seq_device_load_drivers(void)

{

#ifdef CONFIG_KMOD

#ifdef CONFIG_MODULES

	struct ops_list *ops;



	/* 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_register_driver);

EXPORT_SYMBOL(snd_seq_device_unregister_driver);

#ifdef CONFIG_KMOD

EXPORT_SYMBOL(snd_seq_autoload_lock);

EXPORT_SYMBOL(snd_seq_autoload_unlock);
 
#endif

sound/core/sound.c

+4 −4
Original line number Diff line number Diff line
@@ -60,14 +60,14 @@ EXPORT_SYMBOL(snd_ecards_limit); 
static struct snd_minor *snd_minors[SNDRV_OS_MINORS];

static DEFINE_MUTEX(sound_mutex);



#ifdef CONFIG_KMOD

#ifdef CONFIG_MODULES



/**

 * snd_request_card - try to load the card module

 * @card: the 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)

{
@@ -92,7 +92,7 @@ static void snd_request_other(int minor) 
	request_module(str);

}



#endif				/* request_module support */

#endif	/* modular kernel */



/**

 * 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;

	mptr = snd_minors[minor];

	if (mptr == NULL) {

#ifdef CONFIG_KMOD

#ifdef CONFIG_MODULES

		int dev = SNDRV_MINOR_DEVICE(minor);

		if (dev == SNDRV_MINOR_CONTROL) {

			/* /dev/aloadC? */

sound/core/timer.c

+3 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static struct snd_timer *snd_timer_find(struct snd_timer_id *tid) 
	return NULL;

}



#ifdef CONFIG_KMOD

#ifdef CONFIG_MODULES



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 */

	mutex_lock(&register_mutex);

	timer = snd_timer_find(tid);

#ifdef CONFIG_KMOD

	if (timer == NULL) {

#ifdef CONFIG_MODULES

	if (!timer) {

		mutex_unlock(&register_mutex);

		snd_timer_request(tid);

		mutex_lock(&register_mutex);