soundwire: intel: remove .trigger operation

Now that the stream trigger is handled at the dai-link level, there is
no need for a dai-level trigger any longer.

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/20200903204739.31206-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 669c8af13f550fbb3d07f8843bd226423964b7de..05de8c44449f5836ec5bdba50faecb2075630a09 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -997,43 +997,6 @@ err:
        return ret;
 }
 
-static int intel_trigger(struct snd_pcm_substream *substream, int cmd,
-                        struct snd_soc_dai *dai)
-{
-       struct sdw_cdns_dma_data *dma;
-       int ret;
-
-       dma = snd_soc_dai_get_dma_data(dai, substream);
-       if (!dma) {
-               dev_err(dai->dev, "failed to get dma data in %s", __func__);
-               return -EIO;
-       }
-
-       switch (cmd) {
-       case SNDRV_PCM_TRIGGER_START:
-       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-       case SNDRV_PCM_TRIGGER_RESUME:
-               ret = sdw_enable_stream(dma->stream);
-               break;
-
-       case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-       case SNDRV_PCM_TRIGGER_SUSPEND:
-       case SNDRV_PCM_TRIGGER_STOP:
-               ret = sdw_disable_stream(dma->stream);
-               break;
-
-       default:
-               ret = -EINVAL;
-               break;
-       }
-
-       if (ret)
-               dev_err(dai->dev,
-                       "%s trigger %d failed: %d",
-                       __func__, cmd, ret);
-       return ret;
-}
-
 static int
 intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
 {
@@ -1135,7 +1098,6 @@ static const struct snd_soc_dai_ops intel_pcm_dai_ops = {
        .startup = intel_startup,
        .hw_params = intel_hw_params,
        .prepare = intel_prepare,
-       .trigger = intel_trigger,
        .hw_free = intel_hw_free,
        .shutdown = intel_shutdown,
        .set_sdw_stream = intel_pcm_set_sdw_stream,
@@ -1146,7 +1108,6 @@ static const struct snd_soc_dai_ops intel_pdm_dai_ops = {
        .startup = intel_startup,
        .hw_params = intel_hw_params,
        .prepare = intel_prepare,
-       .trigger = intel_trigger,
        .hw_free = intel_hw_free,
        .shutdown = intel_shutdown,
        .set_sdw_stream = intel_pdm_set_sdw_stream,