github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: emu10k1: make snd_emu1010_load_firmware_entry() void

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2024-04-28 11:37:15 +02:00 committed by Takashi Iwai
parent 7868e4c179
commit b83587eaf2
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/pci/emu10k1/emu10k1_main.c
View File

@ -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)