[alsa-devel] [PATCH 2/6] ALSA: seq: Don't compile snd_seq_device_load_drivers() for built-in

Takashi Iwai tiwai at suse.de
Mon Feb 16 17:55:40 CET 2015


Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 include/sound/seq_device.h  | 4 ++++
 sound/core/seq/seq_device.c | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/sound/seq_device.h b/include/sound/seq_device.h
index 2b5f24cc7548..d52433563da2 100644
--- a/include/sound/seq_device.h
+++ b/include/sound/seq_device.h
@@ -67,7 +67,11 @@ struct snd_seq_dev_ops {
 /*
  * prototypes
  */
+#ifdef CONFIG_MODULES
 void snd_seq_device_load_drivers(void);
+#else
+#define snd_seq_device_load_drivers()
+#endif
 int snd_seq_device_new(struct snd_card *card, int device, char *id, int argsize, struct snd_seq_device **result);
 int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry, int argsize);
 int snd_seq_device_unregister_driver(char *id);
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
index a752a79a8d3a..075a66c0cc6a 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -198,19 +198,16 @@ void snd_seq_autoload_init(void)
 #endif
 }
 EXPORT_SYMBOL(snd_seq_autoload_init);
-#else
-#define try_autoload(ops) /* NOP */
-#endif
-
 
 void snd_seq_device_load_drivers(void)
 {
-#ifdef CONFIG_MODULES
 	queue_autoload_drivers();
 	flush_work(&autoload_work);
-#endif
 }
 EXPORT_SYMBOL(snd_seq_device_load_drivers);
+#else
+#define try_autoload(ops) /* NOP */
+#endif
 
 /*
  * register a sequencer device
-- 
2.3.0



More information about the Alsa-devel mailing list