Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 18:55:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: emu10k1: make struct snd_emu1010 less wasteful

Browse Source 
Shrink the {in,out}put_source arrays and their data type to what is
actually necessary.

To be still on the safe side, add some static asserts.

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230516093612.3536508-11-oswald.buddenhagen@gmx.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Oswald Buddenhagen 2023-05-16 11:36:12 +02:00 committed by Takashi Iwai
parent 6f3609f8a3
commit 216abe45cf
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/sound/emu10k1.h
View File

@ -1637,9 +1637,12 @@ struct snd_emu_chip_details {
const char *id; /* for backward compatibility - can be NULL if not needed */
};
#define NUM_OUTPUT_DESTS 28
#define NUM_INPUT_DESTS 22
struct snd_emu1010 {
unsigned int output_source[64];
unsigned int input_source[64];
unsigned char output_source[NUM_OUTPUT_DESTS];
unsigned char input_source[NUM_INPUT_DESTS];
unsigned int adc_pads; /* bit mask */
unsigned int dac_pads; /* bit mask */
unsigned int internal_clock; /* 44100 or 48000 */

5
sound/pci/emu10k1/emumixer.c
View File

@ -273,6 +273,7 @@ static const char * const emu1010_output_texts[] = {
LR_CTLS("1010 SPDIF"),
ADAT_CTLS("1010 "),
};
static_assert(ARRAY_SIZE(emu1010_output_texts) <= NUM_OUTPUT_DESTS);
static const unsigned short emu1010_output_dst[] = {
LR_REGS(EMU_DST_DOCK_DAC1),
@ -313,6 +314,7 @@ static const char * const snd_emu1010b_output_texts[] = {
LR_CTLS("1010 SPDIF"),
ADAT_CTLS("1010 "),
};
static_assert(ARRAY_SIZE(snd_emu1010b_output_texts) <= NUM_OUTPUT_DESTS);
static const unsigned short emu1010b_output_dst[] = {
LR_REGS(EMU_DST_DOCK_DAC1),
@ -349,6 +351,7 @@ static const char * const snd_emu1616_output_texts[] = {
ADAT_CTLS("Dock "),
LR_CTLS("Mana DAC"),
};
static_assert(ARRAY_SIZE(snd_emu1616_output_texts) <= NUM_OUTPUT_DESTS);
static const unsigned short emu1616_output_dst[] = {
LR_REGS(EMU_DST_DOCK_DAC1),
@ -377,6 +380,7 @@ static const char * const snd_emu0404_output_texts[] = {
LR_CTLS("DAC"),
LR_CTLS("SPDIF"),
};
static_assert(ARRAY_SIZE(snd_emu0404_output_texts) <= NUM_OUTPUT_DESTS);
static const unsigned short emu0404_output_dst[] = {
LR_REGS(EMU_DST_HAMOA_DAC),
@ -421,6 +425,7 @@ static const char * const emu1010_input_texts[] = {
"DSP 14 Capture Enum",
"DSP 15 Capture Enum",
};
static_assert(ARRAY_SIZE(emu1010_input_texts) <= NUM_INPUT_DESTS);
static const unsigned short emu1010_input_dst[] = {
EMU_DST_ALICE2_EMU32_0,