Skip to content

Commit a255a7e

Browse files
committed
ASoC: sdw_utils: Remove asoc_sdw_find_codec_info_dai()
Remove the asoc_sdw_find_codec_info_dai() function because it isn't reliable and is now unused. It was finding the entry in codec_info_list[] by looking for the matching DAI name. But this is not reliable because the DAI name isn't guaranteed to be unique. Parts using the same codec driver (so the same DAI names) might require different machine driver setup. Change-Id: I178b5e136436b9259242fd5a79e39c011211ca7d Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
1 parent 023cb37 commit a255a7e

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

include/sound/soc_sdw_utils.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_part(const u64 adr);
139139

140140
struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_acpi(const u8 *acpi_id);
141141

142-
struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_dai(const char *dai_name,
143-
int *dai_index);
144-
145142
struct snd_soc_dai_link *asoc_sdw_mc_find_codec_dai_used(struct snd_soc_card *card,
146143
const char *dai_name);
147144

sound/soc/sdw_utils/soc_sdw_utils.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -830,23 +830,6 @@ struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_acpi(const u8 *acpi_id)
830830
}
831831
EXPORT_SYMBOL_NS(asoc_sdw_find_codec_info_acpi, "SND_SOC_SDW_UTILS");
832832

833-
struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_dai(const char *dai_name, int *dai_index)
834-
{
835-
int i, j;
836-
837-
for (i = 0; i < ARRAY_SIZE(codec_info_list); i++) {
838-
for (j = 0; j < codec_info_list[i].dai_num; j++) {
839-
if (!strcmp(codec_info_list[i].dais[j].dai_name, dai_name)) {
840-
*dai_index = j;
841-
return &codec_info_list[i];
842-
}
843-
}
844-
}
845-
846-
return NULL;
847-
}
848-
EXPORT_SYMBOL_NS(asoc_sdw_find_codec_info_dai, "SND_SOC_SDW_UTILS");
849-
850833
static int asoc_sdw_find_codec_info_dai_index(const struct asoc_sdw_codec_info *codec_info,
851834
const char *dai_name)
852835
{

0 commit comments

Comments
 (0)