From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> Now all driver is using snd_soc_dai_link_component for codec_conf. Let's remove legacy style Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> --- include/sound/soc.h | 3 --- sound/soc/soc-core.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index a94e5d2..9787c80 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -960,9 +960,6 @@ struct snd_soc_codec_conf { * specify device either by device name, or by * DT/OF node, but not both. */ - const char *dev_name; - struct device_node *of_node; - struct snd_soc_dai_link_component dlc; /* diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 411b83b..0bd2cb2 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1185,12 +1185,6 @@ static void soc_set_name_prefix(struct snd_soc_card *card, for (i = 0; i < card->num_configs; i++) { struct snd_soc_codec_conf *map = &card->codec_conf[i]; - /* fixme */ - if (map->dev_name) - map->dlc.name = map->dev_name; - if (map->of_node) - map->dlc.of_node = map->of_node; - if (snd_soc_is_matching_component(&map->dlc, component)) { component->name_prefix = map->name_prefix; return; -- 2.7.4 _______________________________________________ Alsa-devel mailing list Alsa-devel@xxxxxxxxxxxxxxxx https://mailman.alsa-project.org/mailman/listinfo/alsa-devel