ASoC: codecs: rt5682-sdw: 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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Author: plbossart

sound/soc/codecs/rt5682-sdw.c

@@ -88,38 +88,18 @@ static const struct regmap_config rt5682_sdw_indirect_regmap = {
 	.reg_write=rt5682_sdw_write,
 };
 
-structsdw_stream_data {
-structsdw_stream_runtime*sdw_stream;
-};
-
 staticintrt5682_set_sdw_stream(structsnd_soc_dai*dai, void*sdw_stream,
 intdirection)
 {
-structsdw_stream_data*stream;
-
-if (!sdw_stream)
-return0;
-
-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);
 
 return0;
 }
 
 staticvoidrt5682_sdw_shutdown(structsnd_pcm_substream*substream,
 structsnd_soc_dai*dai)
 {
-structsdw_stream_data*stream;
-
-stream=snd_soc_dai_get_dma_data(dai, substream);
 snd_soc_dai_set_dma_data(dai, substream, NULL);
-kfree(stream);
 }
 
 staticintrt5682_sdw_hw_params(structsnd_pcm_substream*substream,
@@ -130,14 +110,14 @@ static int rt5682_sdw_hw_params(struct snd_pcm_substream *substream,
 structrt5682_priv*rt5682=snd_soc_component_get_drvdata(component);
 structsdw_stream_configstream_config= {0};
 structsdw_port_configport_config= {0};
-structsdw_stream_data*stream;
+structsdw_stream_runtime*sdw_stream;
 intretval;
 unsigned intval_p=0, val_c=0, osr_p=0, osr_c=0;
 
 dev_dbg(dai->dev, "%s %s", __func__, dai->name);
 
-stream=snd_soc_dai_get_dma_data(dai, substream);
-if (!stream)
+sdw_stream=snd_soc_dai_get_dma_data(dai, substream);
+if (!sdw_stream)
 return-ENOMEM;
 
 if (!rt5682->slave)
@@ -152,7 +132,7 @@ static int rt5682_sdw_hw_params(struct snd_pcm_substream *substream,
 port_config.num=2;
 
 retval=sdw_stream_add_slave(rt5682->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");
 returnretval;
@@ -246,13 +226,13 @@ static int rt5682_sdw_hw_free(struct snd_pcm_substream *substream,
 {
 structsnd_soc_component*component=dai->component;
 structrt5682_priv*rt5682=snd_soc_component_get_drvdata(component);
-structsdw_stream_data*stream=
+structsdw_stream_runtime*sdw_stream=
 snd_soc_dai_get_dma_data(dai, substream);
 
 if (!rt5682->slave)
 return-EINVAL;
 
-sdw_stream_remove_slave(rt5682->slave, stream->sdw_stream);
+sdw_stream_remove_slave(rt5682->slave, sdw_stream);
 return0;
 }