[ALSA] Don't use request_firmware if internal firmwares are defined

Don't use request_firmware() if the internal firmwares are defined
via Kconfig.  Otherwise it results in a significant delay at loading
time (minutes).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

3 files changed, 46 insertions, 48 deletions

diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index e2e59cae2f6e..bd7c816bf6a7 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2340,26 +2340,25 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *
         korg1212->AdatTimeCodePhy = korg1212->sharedBufferPhy +
                 offsetof(struct KorgSharedBuffer, AdatTimeCode);
 
+#ifdef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL
+        dsp_code = &static_dsp_code;
+#else
         err = request_firmware(&dsp_code, "korg/k1212.dsp", &pci->dev);
         if (err < 0) {
                 release_firmware(dsp_code);
-#ifdef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL
-                dsp_code = &static_dsp_code;
-#else
                 snd_printk(KERN_ERR "firmware not available\n");
                 snd_korg1212_free(korg1212);
                 return err;
-#endif
         }
+#endif
 
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                 dsp_code->size, &korg1212->dma_dsp) < 0) {
                 snd_printk(KERN_ERR "korg1212: cannot allocate dsp code memory (%zd bytes)\n", dsp_code->size);
                 snd_korg1212_free(korg1212);
-#ifdef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL
-                if (dsp_code != &static_dsp_code)
+#ifndef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL
+                release_firmware(dsp_code);
 #endif
-                        release_firmware(dsp_code);
                 return -ENOMEM;
         }
 
@@ -2369,10 +2368,9 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *
 
         memcpy(korg1212->dma_dsp.area, dsp_code->data, dsp_code->size);
 
-#ifdef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL
-        if (dsp_code != &static_dsp_code)
+#ifndef CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL
+        release_firmware(dsp_code);
 #endif
-                release_firmware(dsp_code);
 
         rc = snd_korg1212_Send1212Command(korg1212, K1212_DB_RebootCard, 0, 0, 0, 0);
 
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 9badbb3bfbd1..4c1af425ce75 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2240,7 +2240,7 @@ static const struct firmware assp_minisrc = {
         .size = sizeof assp_minisrc_image
 };
 
-#endif /* CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL */
+#else /* CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL */
 
 #ifdef __LITTLE_ENDIAN
 static inline void snd_m3_convert_from_le(const struct firmware *fw) { }
@@ -2255,6 +2255,8 @@ static void snd_m3_convert_from_le(const struct firmware *fw)
 }
 #endif
 
+#endif /* CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL */
+
 
 /*
  * initialize ASSP
@@ -2548,14 +2550,10 @@ static int snd_m3_free(struct snd_m3 *chip)
         if (chip->iobase)
                 pci_release_regions(chip->pci);
 
-#ifdef CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
-        if (chip->assp_kernel_image != &assp_kernel)
+#ifndef CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
+        release_firmware(chip->assp_kernel_image);
+        release_firmware(chip->assp_minisrc_image);
 #endif
-                release_firmware(chip->assp_kernel_image);
-#ifdef CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
-        if (chip->assp_minisrc_image != &assp_minisrc)
-#endif
-                release_firmware(chip->assp_minisrc_image);
 
         pci_disable_device(chip->pci);
         kfree(chip);
@@ -2745,29 +2743,29 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
                 return -ENOMEM;
         }
 
+#ifdef CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
+        chip->assp_kernel_image = &assp_kernel;
+#else
         err = request_firmware(&chip->assp_kernel_image,
                                "ess/maestro3_assp_kernel.fw", &pci->dev);
         if (err < 0) {
-#ifdef CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
-                chip->assp_kernel_image = &assp_kernel;
-#else
                 snd_m3_free(chip);
                 return err;
-#endif
         } else
                 snd_m3_convert_from_le(chip->assp_kernel_image);
+#endif
 
+#ifdef CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
+        chip->assp_minisrc_image = &assp_minisrc;
+#else
         err = request_firmware(&chip->assp_minisrc_image,
                                "ess/maestro3_assp_minisrc.fw", &pci->dev);
         if (err < 0) {
-#ifdef CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL
-                chip->assp_minisrc_image = &assp_minisrc;
-#else
                 snd_m3_free(chip);
                 return err;
-#endif
         } else
                 snd_m3_convert_from_le(chip->assp_minisrc_image);
+#endif
 
         if ((err = pci_request_regions(pci, card->driver)) < 0) {
                 snd_m3_free(chip);
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index b34c3bce270b..3d4beca31c8b 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2016,6 +2016,24 @@ static struct firmware snd_ymfpci_controller_1e_microcode = {
 };
 #endif
 
+#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
+static int snd_ymfpci_request_firmware(struct snd_ymfpci *chip)
+{
+        chip->dsp_microcode = &snd_ymfpci_dsp_microcode;
+        if (chip->device_id == PCI_DEVICE_ID_YAMAHA_724F ||
+            chip->device_id == PCI_DEVICE_ID_YAMAHA_740C ||
+            chip->device_id == PCI_DEVICE_ID_YAMAHA_744 ||
+            chip->device_id == PCI_DEVICE_ID_YAMAHA_754)
+                chip->controller_microcode =
+                        &snd_ymfpci_controller_1e_microcode;
+        else
+                chip->controller_microcode =
+                        &snd_ymfpci_controller_microcode;
+        return 0;
+}
+
+#else /* use fw_loader */
+
 #ifdef __LITTLE_ENDIAN
 static inline void snd_ymfpci_convert_from_le(const struct firmware *fw) { }
 #else
@@ -2044,13 +2062,8 @@ static int snd_ymfpci_request_firmware(struct snd_ymfpci *chip)
                         err = -EINVAL;
                 }
         }
-        if (err < 0) {
-#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
-                chip->dsp_microcode = &snd_ymfpci_dsp_microcode;
-#else
+        if (err < 0)
                 return err;
-#endif
-        }
         is_1e = chip->device_id == PCI_DEVICE_ID_YAMAHA_724F ||
                 chip->device_id == PCI_DEVICE_ID_YAMAHA_740C ||
                 chip->device_id == PCI_DEVICE_ID_YAMAHA_744 ||
@@ -2067,17 +2080,11 @@ static int snd_ymfpci_request_firmware(struct snd_ymfpci *chip)
                         err = -EINVAL;
                 }
         }
-        if (err < 0) {
-#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
-                chip->controller_microcode =
-                        is_1e ? &snd_ymfpci_controller_1e_microcode
-                              : &snd_ymfpci_controller_microcode;
-#else
+        if (err < 0)
                 return err;
-#endif
-        }
         return 0;
 }
+#endif
 
 static void snd_ymfpci_download_image(struct snd_ymfpci *chip)
 {
@@ -2257,15 +2264,10 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip)
         pci_write_config_word(chip->pci, 0x40, chip->old_legacy_ctrl);
         
         pci_disable_device(chip->pci);
-#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
-        if (chip->dsp_microcode != &snd_ymfpci_dsp_microcode)
-#endif
-                release_firmware(chip->dsp_microcode);
-#ifdef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
-        if (chip->controller_microcode != &snd_ymfpci_controller_microcode &&
-            chip->controller_microcode != &snd_ymfpci_controller_1e_microcode)
+#ifndef CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL
+        release_firmware(chip->dsp_microcode);
+        release_firmware(chip->controller_microcode);
 #endif
-                release_firmware(chip->controller_microcode);
         kfree(chip);
         return 0;
 }