ASoC: codecs: rt711-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-9-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt711.c b/sound/soc/codecs/rt711.c
index 862f509505652bdec0fd4f4ccb31c4fac95f51fc..af53cbcc7bf2dd8636937accdeebb514c7f9ddcb 100644 (file)
--- a/sound/soc/codecs/rt711.c
+++ b/sound/soc/codecs/rt711.c
@@ -964,19 +964,7 @@ static const struct snd_soc_component_driver soc_codec_dev_rt711 = {
 static int rt711_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;
 }
@@ -984,11 +972,7 @@ static int rt711_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream,
 static void rt711_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_pcm_hw_params(struct snd_pcm_substream *substream,
@@ -999,14 +983,14 @@ static int rt711_pcm_hw_params(struct snd_pcm_substream *substream,
        struct rt711_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 val = 0;
 
        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)
@@ -1027,7 +1011,7 @@ static int rt711_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;
@@ -1075,13 +1059,13 @@ static int rt711_pcm_hw_free(struct snd_pcm_substream *substream,
 {
        struct snd_soc_component *component = dai->component;
        struct rt711_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;
 }
 

diff --git a/sound/soc/codecs/rt711.h b/sound/soc/codecs/rt711.h
index f50f8c8d0934983de87b5b4fcf6aa23a3681d914..b31351f11df97995c47fdb0896746f98bcd5c618 100644 (file)
--- a/sound/soc/codecs/rt711.h
+++ b/sound/soc/codecs/rt711.h
@@ -29,10 +29,6 @@ struct  rt711_priv {
        bool disable_irq;
 };
 
-struct sdw_stream_data {
-       struct sdw_stream_runtime *sdw_stream;
-};
-
 /* NID */
 #define RT711_AUDIO_FUNCTION_GROUP                     0x01
 #define RT711_DAC_OUT2                                 0x03