soundwire: intel: remove stream allocation/free

To support streaming across multiple links, the stream allocation/free
needs to be at the dailink level, not the dai.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20200630184356.24939-4-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 3f2f23c..2e1e108 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -625,57 +625,6 @@ static int intel_post_bank_switch(struct sdw_bus *bus)
  * DAI routines
  */
 
-static int sdw_stream_setup(struct snd_pcm_substream *substream,
-                           struct snd_soc_dai *dai)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct sdw_stream_runtime *sdw_stream = NULL;
-       char *name;
-       int i, ret;
-
-       if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-               name = kasprintf(GFP_KERNEL, "%s-Playback", dai->name);
-       else
-               name = kasprintf(GFP_KERNEL, "%s-Capture", dai->name);
-
-       if (!name)
-               return -ENOMEM;
-
-       sdw_stream = sdw_alloc_stream(name);
-       if (!sdw_stream) {
-               dev_err(dai->dev, "alloc stream failed for DAI %s", dai->name);
-               ret = -ENOMEM;
-               goto error;
-       }
-
-       /* Set stream pointer on CPU DAI */
-       ret = snd_soc_dai_set_sdw_stream(dai, sdw_stream, substream->stream);
-       if (ret < 0) {
-               dev_err(dai->dev, "failed to set stream pointer on cpu dai %s",
-                       dai->name);
-               goto release_stream;
-       }
-
-       /* Set stream pointer on all CODEC DAIs */
-       for (i = 0; i < rtd->num_codecs; i++) {
-               ret = snd_soc_dai_set_sdw_stream(asoc_rtd_to_codec(rtd, i), sdw_stream,
-                                                substream->stream);
-               if (ret < 0) {
-                       dev_err(dai->dev, "failed to set stream pointer on codec dai %s",
-                               asoc_rtd_to_codec(rtd, i)->name);
-                       goto release_stream;
-               }
-       }
-
-       return 0;
-
-release_stream:
-       sdw_release_stream(sdw_stream);
-error:
-       kfree(name);
-       return ret;
-}
-
 static int intel_startup(struct snd_pcm_substream *substream,
                         struct snd_soc_dai *dai)
 {
@@ -683,8 +632,7 @@ static int intel_startup(struct snd_pcm_substream *substream,
         * TODO: add pm_runtime support here, the startup callback
         * will make sure the IP is 'active'
         */
-
-       return sdw_stream_setup(substream, dai);
+       return 0;
 }
 
 static int intel_hw_params(struct snd_pcm_substream *substream,
@@ -852,9 +800,6 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
                return ret;
        }
 
-       kfree(dma->stream->name);
-       sdw_release_stream(dma->stream);
-
        return 0;
 }