From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org
Cc: liam.r.girdwood@linux.intel.com, patches.audio@intel.com,
broonie@kernel.org, Vinod Koul <vinod.koul@intel.com>
Subject: [PATCH 3/3] ASoC: Intel: Skylake: remove module id query at runtime
Date: Wed, 10 Aug 2016 09:40:50 +0530 [thread overview]
Message-ID: <1470802250-9232-4-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1470802250-9232-1-git-send-email-vinod.koul@intel.com>
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>
---
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
next prev parent reply other threads:[~2016-08-10 4:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 4:10 [PATCH 0/3] ASoC: Intel: Skylake: Refine manifest module info Vinod Koul
2016-08-10 4:10 ` [PATCH 1/3] ASoC: Intel: Skylake: modify snd_skl_get_module_info args Vinod Koul
2016-08-10 4:10 ` [PATCH 2/3] ASoC: Intel: Skylake: Populate modules after loading Vinod Koul
2016-08-10 20:04 ` Applied "ASoC: Intel: Skylake: Populate modules after loading" to the asoc tree Mark Brown
2016-08-10 4:10 ` Vinod Koul [this message]
2016-08-10 20:04 ` Applied "ASoC: Intel: Skylake: remove module id query at runtime" " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1470802250-9232-4-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=patches.audio@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).