Merge tag 'soundwire-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux.git] / drivers / soundwire / qcom.c

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index d869e2276815c6439062217acbb9387c4b015ca4..3c4d6debab1f36b2648174071b7ad153ca4aac09 100644 (file)
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -1261,10 +1261,7 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream,
                             struct snd_soc_dai *dai)
 {
        struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev);
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct sdw_stream_runtime *sruntime;
-       struct snd_soc_dai *codec_dai;
-       int ret, i;
+       int ret;
 
        ret = pm_runtime_get_sync(ctrl->dev);
        if (ret < 0 && ret != -EACCES) {
@@ -1275,33 +1272,7 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream,
                return ret;
        }
 
-       sruntime = sdw_alloc_stream(dai->name);
-       if (!sruntime) {
-               ret = -ENOMEM;
-               goto err_alloc;
-       }
-
-       ctrl->sruntime[dai->id] = sruntime;
-
-       for_each_rtd_codec_dais(rtd, i, codec_dai) {
-               ret = snd_soc_dai_set_stream(codec_dai, sruntime,
-                                            substream->stream);
-               if (ret < 0 && ret != -ENOTSUPP) {
-                       dev_err(dai->dev, "Failed to set sdw stream on %s\n",
-                               codec_dai->name);
-                       goto err_set_stream;
-               }
-       }
-
        return 0;
-
-err_set_stream:
-       sdw_release_stream(sruntime);
-err_alloc:
-       pm_runtime_mark_last_busy(ctrl->dev);
-       pm_runtime_put_autosuspend(ctrl->dev);
-
-       return ret;
 }
 
 static void qcom_swrm_shutdown(struct snd_pcm_substream *substream,
@@ -1310,8 +1281,6 @@ static void qcom_swrm_shutdown(struct snd_pcm_substream *substream,
        struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev);
 
        swrm_wait_for_wr_fifo_done(ctrl);
-       sdw_release_stream(ctrl->sruntime[dai->id]);
-       ctrl->sruntime[dai->id] = NULL;
        pm_runtime_mark_last_busy(ctrl->dev);
        pm_runtime_put_autosuspend(ctrl->dev);