diff options
author | Vinod Koul <vinod.koul@intel.com> | 2016-08-10 00:10:50 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-08-10 13:54:05 -0400 |
commit | a657ae7e5c0c9fd8858e5498e6de65c222d206d1 (patch) | |
tree | 6b494fe50a7d671afcf02f267cbb02f80025abef /sound | |
parent | 64cb1d0ad0eada322c2011e15710d2a1c12ce8b6 (diff) |
ASoC: Intel: Skylake: remove module id query at runtime
Now that we have balanced loading of the topology file and split of init
and fw_init and fill module data during asoc probe.
So remove it from runtime, but keep error check in case things fall apart.
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index c09e2c7608a3..4bc8f9c269db 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c | |||
@@ -475,12 +475,10 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe) | |||
475 | 475 | ||
476 | /* check if module ids are populated */ | 476 | /* check if module ids are populated */ |
477 | if (mconfig->id.module_id < 0) { | 477 | if (mconfig->id.module_id < 0) { |
478 | ret = snd_skl_get_module_info(skl->skl_sst, mconfig); | 478 | dev_err(skl->skl_sst->dev, |
479 | if (ret < 0) { | 479 | "module %pUL id not populated\n", |
480 | dev_err(skl->skl_sst->dev, | 480 | (uuid_le *)mconfig->guid); |
481 | "query module info failed: %d\n", ret); | 481 | return -EIO; |
482 | return ret; | ||
483 | } | ||
484 | } | 482 | } |
485 | 483 | ||
486 | /* check resource available */ | 484 | /* check resource available */ |