Skip to content

Commit 5e1df54

Browse files
plbossartvinodkoul
authored andcommitted
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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20220126011715.28204-18-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent ac3bc88 commit 5e1df54

1 file changed

Lines changed: 22 additions & 12 deletions

File tree

drivers/soundwire/stream.c

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,23 @@ static int sdw_slave_rt_config(struct sdw_slave_runtime *s_rt,
10581058
return 0;
10591059
}
10601060

1061+
static struct sdw_slave_runtime *sdw_slave_rt_find(struct sdw_slave *slave,
1062+
struct sdw_stream_runtime *stream)
1063+
{
1064+
struct sdw_slave_runtime *s_rt, *_s_rt;
1065+
struct sdw_master_runtime *m_rt;
1066+
1067+
list_for_each_entry(m_rt, &stream->master_list, stream_node) {
1068+
/* Retrieve Slave runtime handle */
1069+
list_for_each_entry_safe(s_rt, _s_rt,
1070+
&m_rt->slave_rt_list, m_rt_node) {
1071+
if (s_rt->slave == slave)
1072+
return s_rt;
1073+
}
1074+
}
1075+
return NULL;
1076+
}
1077+
10611078
/**
10621079
* sdw_slave_rt_free() - Free Slave(s) runtime handle
10631080
*
@@ -1069,19 +1086,12 @@ static int sdw_slave_rt_config(struct sdw_slave_runtime *s_rt,
10691086
static void sdw_slave_rt_free(struct sdw_slave *slave,
10701087
struct sdw_stream_runtime *stream)
10711088
{
1072-
struct sdw_slave_runtime *s_rt, *_s_rt;
1073-
struct sdw_master_runtime *m_rt;
1089+
struct sdw_slave_runtime *s_rt;
10741090

1075-
list_for_each_entry(m_rt, &stream->master_list, stream_node) {
1076-
/* Retrieve Slave runtime handle */
1077-
list_for_each_entry_safe(s_rt, _s_rt,
1078-
&m_rt->slave_rt_list, m_rt_node) {
1079-
if (s_rt->slave == slave) {
1080-
list_del(&s_rt->m_rt_node);
1081-
kfree(s_rt);
1082-
return;
1083-
}
1084-
}
1091+
s_rt = sdw_slave_rt_find(slave, stream);
1092+
if (s_rt) {
1093+
list_del(&s_rt->m_rt_node);
1094+
kfree(s_rt);
10851095
}
10861096
}
10871097

0 commit comments

Comments
 (0)