const struct snd_soc_dapm_route max_98373_dapm_routes[] = { @@ -168,17 +181,6 @@ static struct snd_soc_codec_conf max_98390_codec_conf[]
= {
.dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME), .name_prefix = "Left",}, -};
-static struct snd_soc_codec_conf max_98390_4spk_codec_conf[] = {
- {
.dlc = COMP_CODEC_CONF(MAX_98390_DEV0_NAME),.name_prefix = "Right",- },
- {
.dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME),.name_prefix = "Left",- },
if you remove the codec conf, doesn't this impact the Kcontrols names? Does this break existing UCM files?
It's rather hard to review with just the diff.
I just merge two arrays, max_98373_dapm_routes and max_98390_4spk_codec_conf, since the first two entries are the same.
Later in max_98390_set_codec_conf() function we will set the num_configs with number of amplifiers.
void max_98390_set_codec_conf(struct snd_soc_card *card) { unsigned int num_codecs = get_num_codecs(MAX_98390_ACPI_HID);
card->codec_conf = max_98390_codec_conf;
switch (num_codecs) { case 2: case 4: card->num_configs = num_codecs;
Regards, Brent