[alsa-devel] [PATCH 3/3] ASoC: Intel: Skylake: remove module id query at runtime
Vinod Koul
vinod.koul at intel.com
Wed Aug 10 06:10:50 CEST 2016
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 at intel.com>
---
sound/soc/intel/skylake/skl-topology.c | 10 ++++------
1 file 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)
/* check if module ids are populated */
if (mconfig->id.module_id < 0) {
- ret = snd_skl_get_module_info(skl->skl_sst, mconfig);
- if (ret < 0) {
- dev_err(skl->skl_sst->dev,
- "query module info failed: %d\n", ret);
- return ret;
- }
+ dev_err(skl->skl_sst->dev,
+ "module %pUL id not populated\n",
+ (uuid_le *)mconfig->guid);
+ return -EIO;
}
/* check resource available */
--
1.9.1
More information about the Alsa-devel
mailing list