diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-14 14:33:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-01-19 14:06:10 +0000 |
| commit | d3afb00220becf81bc2d9016f04e05949dfd5bb2 (patch) | |
| tree | 8b49c67efa7ac5f5e9b7a3921909b058b0157e90 /sound | |
| parent | 39860fe070c97e62ae9e80addce40ce0b3c2b082 (diff) | |
| download | linux-stable-d3afb00220becf81bc2d9016f04e05949dfd5bb2.tar.gz linux-stable-d3afb00220becf81bc2d9016f04e05949dfd5bb2.tar.bz2 linux-stable-d3afb00220becf81bc2d9016f04e05949dfd5bb2.zip | |
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: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20210114133337.1039-2-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/skylake/skl.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 8b993722f74e..5b1a15e39912 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -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 |