diff options
| author | Vinod Koul | 2016-08-10 06:10:50 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-08-10 19:54:05 +0200 |
| commit | a657ae7e5c0c9fd8858e5498e6de65c222d206d1 (patch) | |
| tree | 6b494fe50a7d671afcf02f267cbb02f80025abef /sound/soc/intel/skylake/skl-topology.c | |
| parent | ASoC: Intel: Skylake: Populate modules after loading (diff) | |
| download | kernel-qcow2-linux-a657ae7e5c0c9fd8858e5498e6de65c222d206d1.tar.gz kernel-qcow2-linux-a657ae7e5c0c9fd8858e5498e6de65c222d206d1.tar.xz kernel-qcow2-linux-a657ae7e5c0c9fd8858e5498e6de65c222d206d1.zip | |
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/soc/intel/skylake/skl-topology.c')
| -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) /* 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 */ |