ASoC: codecs: rt1308-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>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@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/20230324014408.1677505-5-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c
index 45544b530d3dcd9c7c79d698ecb39b3294650fbb..1797af824f60bfc9616f8dd601c29d1536aa9b33 100644 (file)
--- a/sound/soc/codecs/rt1308-sdw.c
+++ b/sound/soc/codecs/rt1308-sdw.c
@@ -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;
 }
 

diff --git a/sound/soc/codecs/rt1308-sdw.h b/sound/soc/codecs/rt1308-sdw.h
index 1eaaef9f351b296643772364c1bd739141487f1b..04ff18fa18e2b988bebf1fe5ac4e700a9b71d60f 100644 (file)
--- a/sound/soc/codecs/rt1308-sdw.h
+++ b/sound/soc/codecs/rt1308-sdw.h
@@ -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__ */