Unverified Commit 8a8f944f authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SoundWire codecs: simplify/fix set_stream 

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

Simplify set_stream in SoundWire codecs.
parents 24e9e57f b3a2e00e

sound/soc/codecs/cs42l42-sdw.c

+0 −3
Original line number Diff line number Diff line
@@ -152,9 +152,6 @@ static int cs42l42_sdw_port_prep(struct sdw_slave *slave, 
static int cs42l42_sdw_dai_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream,

					  int direction)

{

	if (!sdw_stream)

		return 0;



	snd_soc_dai_dma_data_set(dai, direction, sdw_stream);



	return 0;

sound/soc/codecs/max98373-sdw.c

+7 −27
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ 
#include "max98373.h"

#include "max98373-sdw.h"



struct sdw_stream_data {

	struct sdw_stream_runtime *sdw_stream;

};



static const u32 max98373_sdw_cache_reg[] = {

	MAX98373_R2054_MEAS_ADC_PVDD_CH_READBACK,

	MAX98373_R2055_MEAS_ADC_THERM_CH_READBACK,
@@ -536,12 +532,12 @@ static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream, 
		snd_soc_component_get_drvdata(component);

	struct sdw_stream_config stream_config = {0};

	struct sdw_port_config port_config = {0};

	struct sdw_stream_data *stream;

	struct sdw_stream_runtime *sdw_stream;

	int ret, chan_sz, sampling_rate;



	stream = snd_soc_dai_get_dma_data(dai, substream);

	sdw_stream = snd_soc_dai_get_dma_data(dai, substream);



	if (!stream)

	if (!sdw_stream)

		return -EINVAL;



	if (!max98373->slave)
@@ -565,7 +561,7 @@ static int max98373_sdw_dai_hw_params(struct snd_pcm_substream *substream, 
	}



	ret = sdw_stream_add_slave(max98373->slave, &stream_config,

				   &port_config, 1, stream->sdw_stream);

				   &port_config, 1, sdw_stream);

	if (ret) {

		dev_err(dai->dev, "Unable to configure port\n");

		return ret;
@@ -664,32 +660,20 @@ static int max98373_pcm_hw_free(struct snd_pcm_substream *substream, 
	struct snd_soc_component *component = dai->component;

	struct max98373_priv *max98373 =

		snd_soc_component_get_drvdata(component);

	struct sdw_stream_data *stream =

	struct sdw_stream_runtime *sdw_stream =

		snd_soc_dai_get_dma_data(dai, substream);



	if (!max98373->slave)

		return -EINVAL;



	sdw_stream_remove_slave(max98373->slave, stream->sdw_stream);

	sdw_stream_remove_slave(max98373->slave, sdw_stream);

	return 0;

}



static int max98373_set_sdw_stream(struct snd_soc_dai *dai,

				   void *sdw_stream, int direction)

{

	struct sdw_stream_data *stream;



	if (!sdw_stream)

		return 0;



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

	if (!stream)

		return -ENOMEM;



	stream->sdw_stream = sdw_stream;



	/* Use tx_mask or rx_mask to configure stream tag and set dma_data */

	snd_soc_dai_dma_data_set(dai, direction, stream);

	snd_soc_dai_dma_data_set(dai, direction, sdw_stream);



	return 0;

}
@@ -697,11 +681,7 @@ static int max98373_set_sdw_stream(struct snd_soc_dai *dai, 
static void max98373_shutdown(struct snd_pcm_substream *substream,

			      struct snd_soc_dai *dai)

{

	struct sdw_stream_data *stream;



	stream = snd_soc_dai_get_dma_data(dai, substream);

	snd_soc_dai_set_dma_data(dai, substream, NULL);

	kfree(stream);

}



static int max98373_sdw_set_tdm_slot(struct snd_soc_dai *dai,

sound/soc/codecs/rt1308-sdw.c

+7 −23
Original line number Diff line number Diff line
@@ -496,19 +496,7 @@ static const struct snd_soc_dapm_route rt1308_dapm_routes[] = { 
static int rt1308_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream,

				int direction)

{

	struct sdw_stream_data *stream;



	if (!sdw_stream)

		return 0;



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

	if (!stream)

		return -ENOMEM;



	stream->sdw_stream = sdw_stream;



	/* Use tx_mask or rx_mask to configure stream tag and set dma_data */

	snd_soc_dai_dma_data_set(dai, direction, stream);

	snd_soc_dai_dma_data_set(dai, direction, sdw_stream);



	return 0;

}
@@ -516,11 +504,7 @@ static int rt1308_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
static void rt1308_sdw_shutdown(struct snd_pcm_substream *substream,

				struct snd_soc_dai *dai)

{

	struct sdw_stream_data *stream;



	stream = snd_soc_dai_get_dma_data(dai, substream);

	snd_soc_dai_set_dma_data(dai, substream, NULL);

	kfree(stream);

}



static int rt1308_sdw_set_tdm_slot(struct snd_soc_dai *dai,
@@ -553,13 +537,13 @@ static int rt1308_sdw_hw_params(struct snd_pcm_substream *substream, 
		snd_soc_component_get_drvdata(component);

	struct sdw_stream_config stream_config = {0};

	struct sdw_port_config port_config = {0};

	struct sdw_stream_data *stream;

	struct sdw_stream_runtime *sdw_stream;

	int retval;



	dev_dbg(dai->dev, "%s %s", __func__, dai->name);

	stream = snd_soc_dai_get_dma_data(dai, substream);

	sdw_stream = snd_soc_dai_get_dma_data(dai, substream);



	if (!stream)

	if (!sdw_stream)

		return -EINVAL;



	if (!rt1308->sdw_slave)
@@ -580,7 +564,7 @@ static int rt1308_sdw_hw_params(struct snd_pcm_substream *substream, 
	}



	retval = sdw_stream_add_slave(rt1308->sdw_slave, &stream_config,

				&port_config, 1, stream->sdw_stream);

				&port_config, 1, sdw_stream);

	if (retval) {

		dev_err(dai->dev, "Unable to configure port\n");

		return retval;
@@ -595,13 +579,13 @@ static int rt1308_sdw_pcm_hw_free(struct snd_pcm_substream *substream, 
	struct snd_soc_component *component = dai->component;

	struct rt1308_sdw_priv *rt1308 =

		snd_soc_component_get_drvdata(component);

	struct sdw_stream_data *stream =

	struct sdw_stream_runtime *sdw_stream =

		snd_soc_dai_get_dma_data(dai, substream);



	if (!rt1308->sdw_slave)

		return -EINVAL;



	sdw_stream_remove_slave(rt1308->sdw_slave, stream->sdw_stream);

	sdw_stream_remove_slave(rt1308->sdw_slave, sdw_stream);

	return 0;

}

sound/soc/codecs/rt1308-sdw.h

+0 −4
Original line number Diff line number Diff line
@@ -170,8 +170,4 @@ struct rt1308_sdw_priv { 
	unsigned int bq_params_cnt;

};



struct sdw_stream_data {

	struct sdw_stream_runtime *sdw_stream;

};



#endif /* __RT1308_SDW_H__ */

sound/soc/codecs/rt1316-sdw.c

+7 −23
Original line number Diff line number Diff line
@@ -494,19 +494,7 @@ static const struct snd_soc_dapm_route rt1316_dapm_routes[] = { 
static int rt1316_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream,

				int direction)

{

	struct sdw_stream_data *stream;



	if (!sdw_stream)

		return 0;



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

	if (!stream)

		return -ENOMEM;



	stream->sdw_stream = sdw_stream;



	/* Use tx_mask or rx_mask to configure stream tag and set dma_data */

	snd_soc_dai_dma_data_set(dai, direction, stream);

	snd_soc_dai_dma_data_set(dai, direction, sdw_stream);



	return 0;

}
@@ -514,11 +502,7 @@ static int rt1316_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
static void rt1316_sdw_shutdown(struct snd_pcm_substream *substream,

				struct snd_soc_dai *dai)

{

	struct sdw_stream_data *stream;



	stream = snd_soc_dai_get_dma_data(dai, substream);

	snd_soc_dai_set_dma_data(dai, substream, NULL);

	kfree(stream);

}



static int rt1316_sdw_hw_params(struct snd_pcm_substream *substream,
@@ -529,13 +513,13 @@ static int rt1316_sdw_hw_params(struct snd_pcm_substream *substream, 
		snd_soc_component_get_drvdata(component);

	struct sdw_stream_config stream_config = {0};

	struct sdw_port_config port_config = {0};

	struct sdw_stream_data *stream;

	struct sdw_stream_runtime *sdw_stream;

	int retval;



	dev_dbg(dai->dev, "%s %s", __func__, dai->name);

	stream = snd_soc_dai_get_dma_data(dai, substream);

	sdw_stream = snd_soc_dai_get_dma_data(dai, substream);



	if (!stream)

	if (!sdw_stream)

		return -EINVAL;



	if (!rt1316->sdw_slave)
@@ -551,7 +535,7 @@ static int rt1316_sdw_hw_params(struct snd_pcm_substream *substream, 
		port_config.num = 2;



	retval = sdw_stream_add_slave(rt1316->sdw_slave, &stream_config,

				&port_config, 1, stream->sdw_stream);

				&port_config, 1, sdw_stream);

	if (retval) {

		dev_err(dai->dev, "Unable to configure port\n");

		return retval;
@@ -566,13 +550,13 @@ static int rt1316_sdw_pcm_hw_free(struct snd_pcm_substream *substream, 
	struct snd_soc_component *component = dai->component;

	struct rt1316_sdw_priv *rt1316 =

		snd_soc_component_get_drvdata(component);

	struct sdw_stream_data *stream =

	struct sdw_stream_runtime *sdw_stream =

		snd_soc_dai_get_dma_data(dai, substream);



	if (!rt1316->sdw_slave)

		return -EINVAL;



	sdw_stream_remove_slave(rt1316->sdw_slave, stream->sdw_stream);

	sdw_stream_remove_slave(rt1316->sdw_slave, sdw_stream);

	return 0;

}