Unverified Commit b2790ecc authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: codecs: rt711-sdca: simplify set_stream 



Using a dynamic allocation to store a single pointer is not very
efficient/useful.

Worse, the memory is released in the SoundWire stream.c file, but
still accessed in the DAI shutdown, leading to kmemleak reports.

And last the API requires the previous stream information to be
cleared when the argument is NULL.

Simplify the code to address all 3 problems.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@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/20230324014408.1677505-10-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fa55b31f

sound/soc/codecs/rt711-sdca.c

+7 −23
Original line number Diff line number Diff line
@@ -1237,19 +1237,7 @@ static const struct snd_soc_component_driver soc_sdca_dev_rt711 = { 
static int rt711_sdca_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;

}
@@ -1257,11 +1245,7 @@ static int rt711_sdca_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
static void rt711_sdca_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 rt711_sdca_pcm_hw_params(struct snd_pcm_substream *substream,
@@ -1272,14 +1256,14 @@ static int rt711_sdca_pcm_hw_params(struct snd_pcm_substream *substream, 
	struct rt711_sdca_priv *rt711 = 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;

	unsigned int sampling_rate;



	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 (!rt711->slave)
@@ -1300,7 +1284,7 @@ static int rt711_sdca_pcm_hw_params(struct snd_pcm_substream *substream, 
	}



	retval = sdw_stream_add_slave(rt711->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;
@@ -1351,13 +1335,13 @@ static int rt711_sdca_pcm_hw_free(struct snd_pcm_substream *substream, 
{

	struct snd_soc_component *component = dai->component;

	struct rt711_sdca_priv *rt711 = 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 (!rt711->slave)

		return -EINVAL;



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

	sdw_stream_remove_slave(rt711->slave, sdw_stream);

	return 0;

}

sound/soc/codecs/rt711-sdca.h

+0 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ struct rt711_sdca_priv { 
	bool fu1e_dapm_mute, fu1e_mixer_l_mute, fu1e_mixer_r_mute;

};



struct sdw_stream_data {

	struct sdw_stream_runtime *sdw_stream;

};



/* NID */

#define RT711_AUDIO_FUNCTION_GROUP			0x01

#define RT711_DAC_OUT2					0x03