Unverified Commit d3afb002 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: intel: skl: Simplify with dma_set_mask_and_coherent() 



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

Let's simplify with dma_set_mask_and_coherent().

Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20210114133337.1039-2-tiwai@suse.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 39860fe0

sound/soc/intel/skylake/skl.c

+2 −6
Original line number Diff line number Diff line
@@ -950,12 +950,8 @@ static int skl_first_init(struct hdac_bus *bus) 
	bus->num_streams = cp_streams + pb_streams;



	/* allow 64bit DMA address if supported by H/W */

	if (!dma_set_mask(bus->dev, DMA_BIT_MASK(64))) {

		dma_set_coherent_mask(bus->dev, DMA_BIT_MASK(64));

	} else {

		dma_set_mask(bus->dev, DMA_BIT_MASK(32));

		dma_set_coherent_mask(bus->dev, DMA_BIT_MASK(32));

	}

	if (dma_set_mask_and_coherent(bus->dev, DMA_BIT_MASK(64)))

		dma_set_mask_and_coherent(bus->dev, DMA_BIT_MASK(32));



	/* initialize streams */

	snd_hdac_ext_stream_init_all