]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: Intel: Skylake: Use helper to setup HOST stream
authorCezary Rojewski <cezary.rojewski@intel.com>
Tue, 26 Sep 2023 08:06:23 +0000 (10:06 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 6 Oct 2023 09:11:39 +0000 (11:11 +0200)
snd_hdac_ext_host_stream_setup() abstracts the procedure details away.
Simplify the code by using it.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20230926080623.43927-5-cezary.rojewski@intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/soc/intel/skylake/skl-pcm.c

index ac3dc8c63c260d681251ecb67ba90ca8389884cb..7502b2e70e4668d6fbdfb19c8835e96912fdf6a5 100644 (file)
@@ -124,7 +124,6 @@ static void skl_set_suspend_active(struct snd_pcm_substream *substream,
 int skl_pcm_host_dma_prepare(struct device *dev, struct skl_pipe_params *params)
 {
        struct hdac_bus *bus = dev_get_drvdata(dev);
-       struct skl_dev *skl = bus_to_skl(bus);
        unsigned int format_val;
        struct hdac_stream *hstream;
        struct hdac_ext_stream *stream;
@@ -149,18 +148,7 @@ int skl_pcm_host_dma_prepare(struct device *dev, struct skl_pipe_params *params)
        if (err < 0)
                return err;
 
-       /*
-        * The recommended SDxFMT programming sequence for BXT
-        * platforms is to couple the stream before writing the format
-        */
-       if (HDA_CONTROLLER_IS_APL(skl->pci)) {
-               snd_hdac_ext_stream_decouple(bus, stream, false);
-               err = snd_hdac_stream_setup(hdac_stream(stream));
-               snd_hdac_ext_stream_decouple(bus, stream, true);
-       } else {
-               err = snd_hdac_stream_setup(hdac_stream(stream));
-       }
-
+       err = snd_hdac_ext_host_stream_setup(stream);
        if (err < 0)
                return err;