Ver Fonte

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>
Vinod Koul há 9 anos atrás
pai
commit
a657ae7e5c
1 ficheiros alterados com 4 adições e 6 exclusões
  1. 4 6
      sound/soc/intel/skylake/skl-topology.c

+ 4 - 6
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 */
 		/* check if module ids are populated */
 		if (mconfig->id.module_id < 0) {
 		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 */
 		/* check resource available */