ASoC: Intel: avs: Use helper function to set up DMA

dma_set_mask() and dma_set_coherent_mask() can be performed with one
call to dma_set_mask_and_coherent(), which slightly reduces amount of
code on our side.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220707124153.1858249-9-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 6a35bf45efcb5a13c8065e37a0453790467d7d7c..c50c20fd681a165f3afc6a13726663d0ec2bfa99 100644 (file)
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -440,12 +440,8 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
        if (bus->mlcap)
                snd_hdac_ext_bus_get_ml_capabilities(bus);
 
-       if (!dma_set_mask(dev, DMA_BIT_MASK(64))) {
-               dma_set_coherent_mask(dev, DMA_BIT_MASK(64));
-       } else {
-               dma_set_mask(dev, DMA_BIT_MASK(32));
-               dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
-       }
+       if (!dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)))
+               dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
        dma_set_max_seg_size(dev, UINT_MAX);
 
        ret = avs_hdac_bus_init_streams(bus);