Skip to content

Commit 42aad41

Browse files
plbossartvinodkoul
authored andcommitted
soundwire: stream: move list addition to sdw_slave_alloc_rt()
Simplify sdw_stream_add_slave() by moving the linked list management inside of the sdw_slave_alloc_rt_free() helper, this also makes the alloc/free helpers more symmetrical. 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-16-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 00ce0d2 commit 42aad41

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

drivers/soundwire/stream.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,11 +1019,13 @@ static int sdw_master_port_config(struct sdw_master_runtime *m_rt,
10191019
* sdw_slave_rt_alloc() - Allocate a Slave runtime handle.
10201020
*
10211021
* @slave: Slave handle
1022+
* @m_rt: Master runtime handle
10221023
*
10231024
* This function is to be called with bus_lock held.
10241025
*/
10251026
static struct sdw_slave_runtime
1026-
*sdw_slave_rt_alloc(struct sdw_slave *slave)
1027+
*sdw_slave_rt_alloc(struct sdw_slave *slave,
1028+
struct sdw_master_runtime *m_rt)
10271029
{
10281030
struct sdw_slave_runtime *s_rt;
10291031

@@ -1034,6 +1036,8 @@ static struct sdw_slave_runtime
10341036
INIT_LIST_HEAD(&s_rt->port_list);
10351037
s_rt->slave = slave;
10361038

1039+
list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);
1040+
10371041
return s_rt;
10381042
}
10391043

@@ -1949,13 +1953,12 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
19491953
goto stream_error;
19501954

19511955
skip_alloc_master_rt:
1952-
s_rt = sdw_slave_rt_alloc(slave);
1956+
s_rt = sdw_slave_rt_alloc(slave, m_rt);
19531957
if (!s_rt) {
19541958
dev_err(&slave->dev, "Slave runtime alloc failed for stream:%s\n", stream->name);
19551959
ret = -ENOMEM;
19561960
goto stream_error;
19571961
}
1958-
list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);
19591962

19601963
ret = sdw_slave_rt_config(s_rt, stream_config);
19611964
if (ret)

0 commit comments

Comments
 (0)