Commit edd5cf99 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: stream: split sdw_alloc_slave_rt() in alloc and config 



Split the two parts so that we can do multiple configurations during
ALSA/ASoC hw_params stage. Also follow existing convention
sdw_<object>_<action> used at lower level.

No functionality change here.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220126011715.28204-13-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent bf75ba4b

drivers/soundwire/stream.c

+25 −10
Original line number Diff line number Diff line
@@ -1055,16 +1055,14 @@ struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name) 
EXPORT_SYMBOL(sdw_alloc_stream);



/**

 * sdw_alloc_slave_rt() - Allocate and initialize Slave runtime handle.

 * sdw_slave_rt_alloc() - Allocate a Slave runtime handle.

 *

 * @slave: Slave handle

 * @stream_config: Stream configuration

 *

 * This function is to be called with bus_lock held.

 */

static struct sdw_slave_runtime

*sdw_alloc_slave_rt(struct sdw_slave *slave,

		    struct sdw_stream_config *stream_config)

*sdw_slave_rt_alloc(struct sdw_slave *slave)

{

	struct sdw_slave_runtime *s_rt;
@@ -1073,13 +1071,28 @@ static struct sdw_slave_runtime 
		return NULL;



	INIT_LIST_HEAD(&s_rt->port_list);

	s_rt->ch_count = stream_config->ch_count;

	s_rt->direction = stream_config->direction;

	s_rt->slave = slave;



	return s_rt;

}



/**

 * sdw_slave_rt_config() - Configure a Slave runtime handle.

 *

 * @s_rt: Slave runtime handle

 * @stream_config: Stream configuration

 *

 * This function is to be called with bus_lock held.

 */

static int sdw_slave_rt_config(struct sdw_slave_runtime *s_rt,

			       struct sdw_stream_config *stream_config)

{

	s_rt->ch_count = stream_config->ch_count;

	s_rt->direction = stream_config->direction;



	return 0;

}



static struct sdw_master_runtime

*sdw_master_rt_find(struct sdw_bus *bus,

		    struct sdw_stream_runtime *stream)
@@ -1423,16 +1436,18 @@ int sdw_stream_add_slave(struct sdw_slave *slave, 
		goto stream_error;



skip_alloc_master_rt:

	s_rt = sdw_alloc_slave_rt(slave, stream_config);

	s_rt = sdw_slave_rt_alloc(slave);

	if (!s_rt) {

		dev_err(&slave->dev,

			"Slave runtime config failed for stream:%s\n",

			stream->name);

		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)

		goto stream_error;



	ret = sdw_config_stream(&slave->dev, stream, stream_config, true);

	if (ret)

		goto stream_error;