diff options
| author |  Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
| 2024-04-28 11:37:15 +0200 |
|---|---|---|
| committer |  Takashi Iwai <tiwai@suse.de>
| 2024-04-28 12:00:36 +0200 |
| commit | b83587eaf2a85640fd9e2633309b76596ece4fd5 (patch) | |
| tree | a562e2b20e4658e86cfb2b85c499fc319ca41733 /sound/pci | |
| parent | ALSA: emu10k1: simplify E-MU card FPGA reset sequence (diff) | |
| download | linux-b83587eaf2a85640fd9e2633309b76596ece4fd5.tar.gz linux-b83587eaf2a85640fd9e2633309b76596ece4fd5.tar.bz2 linux-b83587eaf2a85640fd9e2633309b76596ece4fd5.zip | |
ALSA: emu10k1: make snd_emu1010_load_firmware_entry() void
There is only one call site, and there we already know that we actually
have a firmware.
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Message-ID: <20240428093717.3198716-3-oswald.buddenhagen@gmx.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 353dd3b61c61..ec010971a220 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -652,7 +652,7 @@ static int snd_emu10k1_cardbus_init(struct snd_emu10k1 *emu) return 0; } -static int snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu, +static void snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu, const struct firmware *fw_entry) { int n, i; @@ -660,9 +660,6 @@ static int snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu, u8 value; __always_unused u16 write_post; - if (!fw_entry) - return -EIO; - /* The FPGA is a Xilinx Spartan IIE XC2S50E */ /* On E-MU 0404b it is a Xilinx Spartan III XC3S50 */ /* GPIO7 -> FPGA PGMN @@ -694,8 +691,6 @@ static int snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu, outw(0x10, emu->port + A_GPIO); write_post = inw(emu->port + A_GPIO); spin_unlock_irq(&emu->emu_lock); - - return 0; } /* firmware file names, per model, init-fw and dock-fw (optional) */ @@ -729,7 +724,8 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, int dock, return err; } - return snd_emu1010_load_firmware_entry(emu, *fw); + snd_emu1010_load_firmware_entry(emu, *fw); + return 0; } static void snd_emu1010_load_dock_firmware(struct snd_emu10k1 *emu) |