]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: SOF: Remove the get_stream_position callback
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Thu, 21 Mar 2024 13:08:07 +0000 (15:08 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Apr 2024 14:38:18 +0000 (16:38 +0200)
commit 07007b8ac42cffc23043d00e56b0f67a75dc4b22 upstream.

The get_stream_position has been replaced by get_dai_frame_counter and all
related code can be dropped form the core.

Cc: stable@vger.kernel.org # 6.8
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240321130814.4412-11-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/sof/ops.h
sound/soc/sof/sof-priv.h

index cce133410dda9dddd8d072611d42a7d9673428d2..2505a1e1ce340f09b0e3311275de4e127cdbffe0 100644 (file)
@@ -523,16 +523,6 @@ static inline int snd_sof_pcm_platform_ack(struct snd_sof_dev *sdev,
        return 0;
 }
 
-static inline u64 snd_sof_pcm_get_stream_position(struct snd_sof_dev *sdev,
-                                                 struct snd_soc_component *component,
-                                                 struct snd_pcm_substream *substream)
-{
-       if (sof_ops(sdev) && sof_ops(sdev)->get_stream_position)
-               return sof_ops(sdev)->get_stream_position(sdev, component, substream);
-
-       return 0;
-}
-
 static inline u64
 snd_sof_pcm_get_dai_frame_counter(struct snd_sof_dev *sdev,
                                  struct snd_soc_component *component,
index cfc11d300c16d998417d35b7538325f38b5619ed..09eb2de445fee5a38a5221075c8051f5679523fe 100644 (file)
@@ -254,15 +254,6 @@ struct snd_sof_dsp_ops {
        /* pcm ack */
        int (*pcm_ack)(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream); /* optional */
 
-       /*
-        * optional callback to retrieve the link DMA position for the substream
-        * when the position is not reported in the shared SRAM windows but
-        * instead from a host-accessible hardware counter.
-        */
-       u64 (*get_stream_position)(struct snd_sof_dev *sdev,
-                                  struct snd_soc_component *component,
-                                  struct snd_pcm_substream *substream); /* optional */
-
        /*
         * optional callback to retrieve the number of frames left/arrived from/to
         * the DSP on the DAI side (link/codec/DMIC/etc).