Sfoglia il codice sorgente

ALSA: seq: Don't compile snd_seq_device_load_drivers() for built-in

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 10 anni fa
parent
commit
72496edcf8
2 ha cambiato i file con 7 aggiunte e 6 eliminazioni
  1. 4 0
      include/sound/seq_device.h
  2. 3 6
      sound/core/seq/seq_device.c

+ 4 - 0
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);

+ 3 - 6
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