提交 5e1df543 编写于 作者: P Pierre-Louis Bossart 提交者: Vinod Koul

soundwire: stream: introduce sdw_slave_rt_find() helper

Before we split the alloc and config steps, we need a helper to find
the Slave runtime for a stream. The helper is based on the search loop
in sdw_slave_rt_free(), which can now be simplified.
Signed-off-by: NPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: NRander Wang <rander.wang@intel.com>
Signed-off-by: NBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220126011715.28204-18-yung-chuan.liao@linux.intel.comSigned-off-by: NVinod Koul <vkoul@kernel.org>
上级 ac3bc88c
...@@ -1058,6 +1058,23 @@ static int sdw_slave_rt_config(struct sdw_slave_runtime *s_rt, ...@@ -1058,6 +1058,23 @@ static int sdw_slave_rt_config(struct sdw_slave_runtime *s_rt,
return 0; return 0;
} }
static struct sdw_slave_runtime *sdw_slave_rt_find(struct sdw_slave *slave,
struct sdw_stream_runtime *stream)
{
struct sdw_slave_runtime *s_rt, *_s_rt;
struct sdw_master_runtime *m_rt;
list_for_each_entry(m_rt, &stream->master_list, stream_node) {
/* Retrieve Slave runtime handle */
list_for_each_entry_safe(s_rt, _s_rt,
&m_rt->slave_rt_list, m_rt_node) {
if (s_rt->slave == slave)
return s_rt;
}
}
return NULL;
}
/** /**
* sdw_slave_rt_free() - Free Slave(s) runtime handle * sdw_slave_rt_free() - Free Slave(s) runtime handle
* *
...@@ -1069,19 +1086,12 @@ static int sdw_slave_rt_config(struct sdw_slave_runtime *s_rt, ...@@ -1069,19 +1086,12 @@ static int sdw_slave_rt_config(struct sdw_slave_runtime *s_rt,
static void sdw_slave_rt_free(struct sdw_slave *slave, static void sdw_slave_rt_free(struct sdw_slave *slave,
struct sdw_stream_runtime *stream) struct sdw_stream_runtime *stream)
{ {
struct sdw_slave_runtime *s_rt, *_s_rt; struct sdw_slave_runtime *s_rt;
struct sdw_master_runtime *m_rt;
list_for_each_entry(m_rt, &stream->master_list, stream_node) { s_rt = sdw_slave_rt_find(slave, stream);
/* Retrieve Slave runtime handle */ if (s_rt) {
list_for_each_entry_safe(s_rt, _s_rt, list_del(&s_rt->m_rt_node);
&m_rt->slave_rt_list, m_rt_node) { kfree(s_rt);
if (s_rt->slave == slave) {
list_del(&s_rt->m_rt_node);
kfree(s_rt);
return;
}
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册