diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-12-13 01:55:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-12-16 13:02:56 +0100 |
| commit | ee8f537fd8b71c555d01a89e0834413bbf5373d4 (patch) | |
| tree | faedd16776d6376294f5c08619a5320bac3200fc | |
| parent | ASoC: ti: rx51: use snd_soc_dai_link_component for codec_conf (diff) | |
| download | linux-ee8f537fd8b71c555d01a89e0834413bbf5373d4.tar.xz linux-ee8f537fd8b71c555d01a89e0834413bbf5373d4.zip | |
ASoC: soc-core: remove legacy style of codec_conf
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@renesas.com>
Link: https://lore.kernel.org/r/871rt959ic.wl-kuninori.morimoto.gx@renesas.com
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | include/sound/soc.h | 3 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index a94e5d2fc2b2..9787c80e548b 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 411b83ba2fc0..0bd2cb2e7a67 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; |