diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2009-04-06 14:38:43 -0700 |
|---|---|---|
| committer |   David Woodhouse <David.Woodhouse@intel.com> | 2009-04-06 14:38:43 -0700 |
| commit | 7c7cae17e04765692aa3d2bda5c771f909219f27 (patch) | |
| tree | dbbfe26131cdc959f3f425ffb9ac33fbc2afab10 /sound/isa/wavefront/wavefront_fx.c | |
| parent | Remove fdump tool for av7110 firmware (diff) | |
| download | linux-dev-7c7cae17e04765692aa3d2bda5c771f909219f27.tar.xz linux-dev-7c7cae17e04765692aa3d2bda5c771f909219f27.zip | |
ALSA: wavefront - Always use request_firmware()
Always use request_firmware() for loading yss225_registers image.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | sound/isa/wavefront/wavefront_fx.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c index dfc449a2194e..a4345fc07561 100644 --- a/sound/isa/wavefront/wavefront_fx.c +++ b/sound/isa/wavefront/wavefront_fx.c @@ -34,14 +34,6 @@ #define WAIT_IDLE 0xff -#ifdef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL -#include "yss225.c" -static const struct firmware yss225_registers_firmware = { - .data = (u8 *)yss225_registers, - .size = sizeof yss225_registers -}; -#endif - static int wavefront_fx_idle (snd_wavefront_t *dev) @@ -260,16 +252,12 @@ snd_wavefront_fx_start (snd_wavefront_t *dev) 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) { err = -1; goto out; } -#endif for (i = 0; i + 1 < firmware->size; i += 2) { if (firmware->data[i] >= 8 && firmware->data[i] < 16) { @@ -292,12 +280,8 @@ snd_wavefront_fx_start (snd_wavefront_t *dev) err = 0; out: -#ifndef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL release_firmware(firmware); -#endif return err; } -#ifndef CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL MODULE_FIRMWARE("yamaha/yss225_registers.bin"); -#endif |