mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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: 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-11-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2022-01-26 09:17:06 +08:00 committed by Vinod Koul
parent 1a21892d59
commit bb10659a6f
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
drivers/soundwire/stream.c
View file

@ -1055,7 +1055,7 @@ struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name)
EXPORT_SYMBOL(sdw_alloc_stream); EXPORT_SYMBOL(sdw_alloc_stream);
static struct sdw_master_runtime static struct sdw_master_runtime
*sdw_find_master_rt(struct sdw_bus *bus, *sdw_master_rt_find(struct sdw_bus *bus,
struct sdw_stream_runtime *stream) struct sdw_stream_runtime *stream)
{ {
struct sdw_master_runtime *m_rt; struct sdw_master_runtime *m_rt;
@ -1070,17 +1070,15 @@ static struct sdw_master_runtime
} }
/** /**
* sdw_alloc_master_rt() - Allocates and initialize Master runtime handle * sdw_master_rt_alloc() - Allocates a Master runtime handle
* *
* @bus: SDW bus instance * @bus: SDW bus instance
* @stream_config: Stream configuration
* @stream: Stream runtime handle. * @stream: Stream runtime handle.
* *
* This function is to be called with bus_lock held. * This function is to be called with bus_lock held.
*/ */
static struct sdw_master_runtime static struct sdw_master_runtime
*sdw_alloc_master_rt(struct sdw_bus *bus, *sdw_master_rt_alloc(struct sdw_bus *bus,
struct sdw_stream_config *stream_config,
struct sdw_stream_runtime *stream) struct sdw_stream_runtime *stream)
{ {
struct sdw_master_runtime *m_rt; struct sdw_master_runtime *m_rt;
@ -1096,14 +1094,30 @@ static struct sdw_master_runtime
list_add_tail(&m_rt->bus_node, &bus->m_rt_list); list_add_tail(&m_rt->bus_node, &bus->m_rt_list);
m_rt->ch_count = stream_config->ch_count;
m_rt->bus = bus; m_rt->bus = bus;
m_rt->stream = stream; m_rt->stream = stream;
m_rt->direction = stream_config->direction;
return m_rt; return m_rt;
} }
/**
* sdw_master_rt_config() - Configure Master runtime handle
*
* @m_rt: Master runtime handle
* @stream_config: Stream configuration
*
* This function is to be called with bus_lock held.
*/
static int sdw_master_rt_config(struct sdw_master_runtime *m_rt,
struct sdw_stream_config *stream_config)
{
m_rt->ch_count = stream_config->ch_count;
m_rt->direction = stream_config->direction;
return 0;
}
/** /**
* sdw_alloc_slave_rt() - Allocate and initialize Slave runtime handle. * sdw_alloc_slave_rt() - Allocate and initialize Slave runtime handle.
* *
@ -1321,19 +1335,21 @@ int sdw_stream_add_master(struct sdw_bus *bus,
* check if Master is already allocated (e.g. as a result of Slave adding * check if Master is already allocated (e.g. as a result of Slave adding
* it first), if so skip allocation and go to configuration * it first), if so skip allocation and go to configuration
*/ */
m_rt = sdw_find_master_rt(bus, stream); m_rt = sdw_master_rt_find(bus, stream);
if (m_rt) if (m_rt)
goto skip_alloc_master_rt; goto skip_alloc_master_rt;
m_rt = sdw_alloc_master_rt(bus, stream_config, stream); m_rt = sdw_master_rt_alloc(bus, stream);
if (!m_rt) { if (!m_rt) {
dev_err(bus->dev, dev_err(bus->dev, "Master runtime alloc failed for stream:%s\n", stream->name);
"Master runtime config failed for stream:%s\n",
stream->name);
ret = -ENOMEM; ret = -ENOMEM;
goto unlock; goto unlock;
} }
ret = sdw_master_rt_config(m_rt, stream_config);
if (ret < 0)
goto unlock;
skip_alloc_master_rt: skip_alloc_master_rt:
ret = sdw_config_stream(bus->dev, stream, stream_config, false); ret = sdw_config_stream(bus->dev, stream, stream_config, false);
if (ret) if (ret)
@ -1388,7 +1404,7 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
* check if Master is already allocated, if so skip allocation * check if Master is already allocated, if so skip allocation
* and go to configuration * and go to configuration
*/ */
m_rt = sdw_find_master_rt(slave->bus, stream); m_rt = sdw_master_rt_find(slave->bus, stream);
if (m_rt) if (m_rt)
goto skip_alloc_master_rt; goto skip_alloc_master_rt;
@ -1396,14 +1412,15 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
* If this API is invoked by Slave first then m_rt is not valid. * If this API is invoked by Slave first then m_rt is not valid.
* So, allocate m_rt and add Slave to it. * So, allocate m_rt and add Slave to it.
*/ */
m_rt = sdw_alloc_master_rt(slave->bus, stream_config, stream); m_rt = sdw_master_rt_alloc(slave->bus, stream);
if (!m_rt) { if (!m_rt) {
dev_err(&slave->dev, dev_err(&slave->dev, "Master runtime alloc failed for stream:%s\n", stream->name);
"alloc master runtime failed for stream:%s\n",
stream->name);
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto error;
} }
ret = sdw_master_rt_config(m_rt, stream_config);
if (ret < 0)
goto stream_error;
skip_alloc_master_rt: skip_alloc_master_rt:
s_rt = sdw_alloc_slave_rt(slave, stream_config); s_rt = sdw_alloc_slave_rt(slave, stream_config);