ASoC: SOF: intel: Simplify with dma_set_mask_and_coherent()

ASoC Intel SOF driver still has explicit calls of dma_set_mask() and
dma_set_coherent_mask().

Let's simplify with dma_set_mask_and_coherent().

Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20210114133337.1039-3-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 509a9b25642301bd4d8af17c8a11646e3c0bdfc3..7e703ce22fcd3cd25eff3f4156c3e44351215b94 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -809,13 +809,9 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
        sdev->mailbox_bar = HDA_DSP_BAR;
 
        /* allow 64bit DMA address if supported by H/W */
-       if (!dma_set_mask(&pci->dev, DMA_BIT_MASK(64))) {
-               dev_dbg(sdev->dev, "DMA mask is 64 bit\n");
-               dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(64));
-       } else {
+       if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(64))) {
                dev_dbg(sdev->dev, "DMA mask is 32 bit\n");
-               dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
-               dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32));
+               dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32));
        }
 
        /* init streams */