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

soundwire: stream: move sdw_alloc_slave_rt() before 'master' helpers 



Code move before splitting the function in two.
No functionality change.

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-12-yung-chuan.liao@linux.intel.com


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

drivers/soundwire/stream.c

+26 −26
Original line number Diff line number Diff line
@@ -1054,6 +1054,32 @@ 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.

 *

 * @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)

{

	struct sdw_slave_runtime *s_rt;



	s_rt = kzalloc(sizeof(*s_rt), GFP_KERNEL);

	if (!s_rt)

		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;

}



static struct sdw_master_runtime

*sdw_master_rt_find(struct sdw_bus *bus,

		    struct sdw_stream_runtime *stream)
@@ -1118,32 +1144,6 @@ static int sdw_master_rt_config(struct sdw_master_runtime *m_rt, 
	return 0;

}



/**

 * sdw_alloc_slave_rt() - Allocate and initialize 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)

{

	struct sdw_slave_runtime *s_rt;



	s_rt = kzalloc(sizeof(*s_rt), GFP_KERNEL);

	if (!s_rt)

		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_release_slave_stream() - Free Slave(s) runtime handle

 *