ASoC: Intel: Skylake: remove module id query at runtime
authorVinod Koul <vinod.koul@intel.com>
Wed, 10 Aug 2016 04:10:50 +0000 (09:40 +0530)
committerMark Brown <broonie@kernel.org>
Wed, 10 Aug 2016 17:54:05 +0000 (18:54 +0100)
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>
sound/soc/intel/skylake/skl-topology.c

index c09e2c7608a3f75428804bd22f4d57badfb30b31..4bc8f9c269db7d3e70e6e6228a5d0bbdd69c972c 100644 (file)
@@ -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 */