soundwire: stream: simplify sdw_alloc_master_rt()

Only do the allocation in that function, and move check for allocation
in the caller. This will it easier to split allocation and
configuration.

No functionality change in this patch.

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-10-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 5e2d29448aaf5c76e2e27d084149517e5b21437d..263b76230f8fb2889874f3719052bbec289dc347 100644 (file)
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1085,14 +1085,6 @@ static struct sdw_master_runtime
 {
        struct sdw_master_runtime *m_rt;
 
-       /*
-        * check if Master is already allocated (as a result of Slave adding
-        * it first), if so skip allocation and go to configure
-        */
-       m_rt = sdw_find_master_rt(bus, stream);
-       if (m_rt)
-               goto stream_config;
-
        m_rt = kzalloc(sizeof(*m_rt), GFP_KERNEL);
        if (!m_rt)
                return NULL;
@@ -1104,7 +1096,6 @@ static struct sdw_master_runtime
 
        list_add_tail(&m_rt->bus_node, &bus->m_rt_list);
 
-stream_config:
        m_rt->ch_count = stream_config->ch_count;
        m_rt->bus = bus;
        m_rt->stream = stream;
@@ -1326,6 +1317,14 @@ int sdw_stream_add_master(struct sdw_bus *bus,
                goto unlock;
        }
 
+       /*
+        * check if Master is already allocated (e.g. as a result of Slave adding
+        * it first), if so skip allocation and go to configuration
+        */
+       m_rt = sdw_find_master_rt(bus, stream);
+       if (m_rt)
+               goto skip_alloc_master_rt;
+
        m_rt = sdw_alloc_master_rt(bus, stream_config, stream);
        if (!m_rt) {
                dev_err(bus->dev,
@@ -1335,6 +1334,7 @@ int sdw_stream_add_master(struct sdw_bus *bus,
                goto unlock;
        }
 
+skip_alloc_master_rt:
        ret = sdw_config_stream(bus->dev, stream, stream_config, false);
        if (ret)
                goto stream_error;
@@ -1384,6 +1384,14 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
 
        mutex_lock(&slave->bus->bus_lock);
 
+       /*
+        * check if Master is already allocated, if so skip allocation
+        * and go to configuration
+        */
+       m_rt = sdw_find_master_rt(slave->bus, stream);
+       if (m_rt)
+               goto skip_alloc_master_rt;
+
        /*
         * If this API is invoked by Slave first then m_rt is not valid.
         * So, allocate m_rt and add Slave to it.
@@ -1397,6 +1405,7 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
                goto error;
        }
 
+skip_alloc_master_rt:
        s_rt = sdw_alloc_slave_rt(slave, stream_config);
        if (!s_rt) {
                dev_err(&slave->dev,