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 <[email protected]>
Cc: Takashi Iwai <[email protected]>
---
include/sound/seq_kernel.h | 2 +-
sound/core/seq/seq_clientmgr.c | 2 +-
sound/core/seq/seq_device.c | 6 +++---
sound/core/sound.c | 8 ++++----
sound/core/timer.c | 6 +++---
sound/ppc/daca.c | 2 --
sound/ppc/tumbler.c | 2 --
7 files changed, 12 insertions(+), 16 deletions(-)
--- everything.orig/include/sound/seq_kernel.h 2008-07-08 18:54:04.000000000 +0200
+++ everything/include/sound/seq_kernel.h 2008-07-08 18:57:40.000000000 +0200
@@ -105,7 +105,7 @@ int snd_seq_event_port_attach(int client
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
--- everything.orig/sound/core/seq/seq_clientmgr.c 2008-07-08 18:54:05.000000000 +0200
+++ everything/sound/core/seq/seq_clientmgr.c 2008-07-08 18:57:40.000000000 +0200
@@ -148,7 +148,7 @@ struct snd_seq_client *snd_seq_client_us
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];
--- everything.orig/sound/core/seq/seq_device.c 2008-07-08 18:54:05.000000000 +0200
+++ everything/sound/core/seq/seq_device.c 2008-07-08 18:57:40.000000000 +0200
@@ -124,7 +124,7 @@ static void snd_seq_device_info(struct s
* 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,7 @@ EXPORT_SYMBOL(snd_seq_device_load_driver
EXPORT_SYMBOL(snd_seq_device_new);
EXPORT_SYMBOL(snd_seq_device_register_driver);
EXPORT_SYMBOL(snd_seq_device_unregister_driver);
-#ifdef CONFIG_KMOD
+#ifdef CONFIG_MODULES
EXPORT_SYMBOL(snd_seq_autoload_lock);
EXPORT_SYMBOL(snd_seq_autoload_unlock);
#endif
--- everything.orig/sound/core/sound.c 2008-07-08 18:54:04.000000000 +0200
+++ everything/sound/core/sound.c 2008-07-08 18:57:40.000000000 +0200
@@ -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,
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? */
--- everything.orig/sound/core/timer.c 2008-07-08 18:54:04.000000000 +0200
+++ everything/sound/core/timer.c 2008-07-08 18:57:40.000000000 +0200
@@ -146,7 +146,7 @@ static struct snd_timer *snd_timer_find(
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_inst
/* open a master instance */
mutex_lock(®ister_mutex);
timer = snd_timer_find(tid);
-#ifdef CONFIG_KMOD
- if (timer == NULL) {
+#ifdef CONFIG_MODULES
+ if (!timer) {
mutex_unlock(®ister_mutex);
snd_timer_request(tid);
mutex_lock(®ister_mutex);
--- everything.orig/sound/ppc/daca.c 2008-07-08 18:54:05.000000000 +0200
+++ everything/sound/ppc/daca.c 2008-07-08 18:57:40.000000000 +0200
@@ -249,9 +249,7 @@ int __init snd_pmac_daca_init(struct snd
int i, err;
struct pmac_daca *mix;
-#ifdef CONFIG_KMOD
request_module("i2c-powermac");
-#endif /* CONFIG_KMOD */
mix = kzalloc(sizeof(*mix), GFP_KERNEL);
if (! mix)
--- everything.orig/sound/ppc/tumbler.c 2008-07-08 18:54:05.000000000 +0200
+++ everything/sound/ppc/tumbler.c 2008-07-08 18:57:40.000000000 +0200
@@ -1350,9 +1350,7 @@ int __init snd_pmac_tumbler_init(struct
struct device_node *tas_node, *np;
char *chipname;
-#ifdef CONFIG_KMOD
request_module("i2c-powermac");
-#endif /* CONFIG_KMOD */
mix = kzalloc(sizeof(*mix), GFP_KERNEL);
if (! mix)
--
On Tue, Jul 08, 2008 at 07:00:22PM +0200, Johannes Berg wrote:
>...
> --- everything.orig/sound/core/seq/seq_device.c 2008-07-08 18:54:05.000000000 +0200
> +++ everything/sound/core/seq/seq_device.c 2008-07-08 18:57:40.000000000 +0200
>...
> @@ -566,7 +566,7 @@ EXPORT_SYMBOL(snd_seq_device_load_driver
> EXPORT_SYMBOL(snd_seq_device_new);
> EXPORT_SYMBOL(snd_seq_device_register_driver);
> EXPORT_SYMBOL(snd_seq_device_unregister_driver);
> -#ifdef CONFIG_KMOD
> +#ifdef CONFIG_MODULES
> EXPORT_SYMBOL(snd_seq_autoload_lock);
> EXPORT_SYMBOL(snd_seq_autoload_unlock);
> #endif
>...
You can remove the #ifdef
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
On Tue, 2008-07-08 at 21:30 +0300, Adrian Bunk wrote:
> On Tue, Jul 08, 2008 at 07:00:22PM +0200, Johannes Berg wrote:
> >...
> > --- everything.orig/sound/core/seq/seq_device.c 2008-07-08 18:54:05.000000000 +0200
> > +++ everything/sound/core/seq/seq_device.c 2008-07-08 18:57:40.000000000 +0200
> >...
> > @@ -566,7 +566,7 @@ EXPORT_SYMBOL(snd_seq_device_load_driver
> > EXPORT_SYMBOL(snd_seq_device_new);
> > EXPORT_SYMBOL(snd_seq_device_register_driver);
> > EXPORT_SYMBOL(snd_seq_device_unregister_driver);
> > -#ifdef CONFIG_KMOD
> > +#ifdef CONFIG_MODULES
> > EXPORT_SYMBOL(snd_seq_autoload_lock);
> > EXPORT_SYMBOL(snd_seq_autoload_unlock);
> > #endif
> >...
>
> You can remove the #ifdef
Same here as with dev_load, unless it's actually ok to export static
inlines.
johannes