[ALSA] Remove sound/driver.h

[pandora-kernel.git] / sound / isa / wavefront / wavefront_fx.c

diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c
index 15331ed..2efaa7f 100644 (file)
--- a/sound/isa/wavefront/wavefront_fx.c
+++ b/sound/isa/wavefront/wavefront_fx.c
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/init.h>
 #include <linux/time.h>
@@ -35,9 +34,7 @@
 
 #define WAIT_IDLE      0xff
 
-#define FIRMWARE_IN_THE_KERNEL
-
-#ifdef FIRMWARE_IN_THE_KERNEL
+#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
 #include "yss225.c"
 static const struct firmware yss225_registers_firmware = {
        .data = (u8 *)yss225_registers,
@@ -258,21 +255,21 @@ snd_wavefront_fx_start (snd_wavefront_t *dev)
 {
        unsigned int i;
        int err;
-       const struct firmware *firmware;
+       const struct firmware *firmware = NULL;
 
        if (dev->fx_initialized)
                return 0;
 
+#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
+       firmware = &yss225_registers_firmware;
+#else
        err = request_firmware(&firmware, "yamaha/yss225_registers.bin",
                               dev->card->dev);
        if (err < 0) {
-#ifdef FIRMWARE_IN_THE_KERNEL
-               firmware = &yss225_registers_firmware;
-#else
                err = -1;
                goto out;
-#endif
        }
+#endif
 
        for (i = 0; i + 1 < firmware->size; i += 2) {
                if (firmware->data[i] >= 8 && firmware->data[i] < 16) {
@@ -295,9 +292,12 @@ snd_wavefront_fx_start (snd_wavefront_t *dev)
        err = 0;
 
 out:
-#ifdef FIRMWARE_IN_THE_KERNEL
-       if (firmware != &yss225_registers_firmware)
+#ifndef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
+       release_firmware(firmware);
 #endif
-               release_firmware(firmware);
        return err;
 }
+
+#ifndef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL
+MODULE_FIRMWARE("yamaha/yss225_registers.bin");
+#endif