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>

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 0f54574abb610633d78a5090eb4cccde4d46c2ca..512e7936d57cf914c750c7394eb88eb4d83b4363 100644 (file)
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1019,11 +1019,13 @@ static int sdw_master_port_config(struct sdw_master_runtime *m_rt,
  * sdw_slave_rt_alloc() - Allocate a Slave runtime handle.
  *
  * @slave: Slave handle
+ * @m_rt: Master runtime handle
  *
  * This function is to be called with bus_lock held.
  */
 static struct sdw_slave_runtime
-*sdw_slave_rt_alloc(struct sdw_slave *slave)
+*sdw_slave_rt_alloc(struct sdw_slave *slave,
+                   struct sdw_master_runtime *m_rt)
 {
        struct sdw_slave_runtime *s_rt;
 
@@ -1034,6 +1036,8 @@ static struct sdw_slave_runtime
        INIT_LIST_HEAD(&s_rt->port_list);
        s_rt->slave = slave;
 
+       list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);
+
        return s_rt;
 }
 
@@ -1949,13 +1953,12 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
                goto stream_error;
 
 skip_alloc_master_rt:
-       s_rt = sdw_slave_rt_alloc(slave);
+       s_rt = sdw_slave_rt_alloc(slave, m_rt);
        if (!s_rt) {
                dev_err(&slave->dev, "Slave runtime alloc failed for stream:%s\n", stream->name);
                ret = -ENOMEM;
                goto stream_error;
        }
-       list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);
 
        ret = sdw_slave_rt_config(s_rt, stream_config);
        if (ret)