diff options
| author | Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> | 2020-10-30 10:54:23 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-04 17:51:05 +0000 |
| commit | a5b8f71c5477f4327c66a085d9714fe298510819 (patch) | |
| tree | 7aee0f515a07f57bd50dac2686ece2e082962e98 /sound/soc/intel/skylake | |
| parent | 841fb1096713bdd85cb2484557623136e10041d2 (diff) | |
| download | linux-rpi-a5b8f71c5477f4327c66a085d9714fe298510819.tar.gz linux-rpi-a5b8f71c5477f4327c66a085d9714fe298510819.tar.bz2 linux-rpi-a5b8f71c5477f4327c66a085d9714fe298510819.zip | |
ASoC: topology: Remove multistep topology loading
In theory topology can be loaded in multiple steps by providing index to
snd_soc_tplg_component_load, however, from usability point of view it
doesn't make sense, as can be seen from all current users loading
topology in one go. Remove the unnecessary parameter.
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20201030145427.3497990-3-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 40bee10b0c65..ae466cd59292 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3742,12 +3742,7 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus) } component_load: - - /* - * The complete tplg for SKL is loaded as index 0, we don't use - * any other index - */ - ret = snd_soc_tplg_component_load(component, &skl_tplg_ops, fw, 0); + ret = snd_soc_tplg_component_load(component, &skl_tplg_ops, fw); if (ret < 0) { dev_err(bus->dev, "tplg component load failed%d\n", ret); goto err; @@ -3777,5 +3772,5 @@ void skl_tplg_exit(struct snd_soc_component *component, struct hdac_bus *bus) list_del(&ppl->node); /* clean up topology */ - snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL); + snd_soc_tplg_component_remove(component); } |