diff options
| author | Mark Brown <broonie@kernel.org> | 2019-08-09 00:20:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-09 00:20:45 +0200 |
| commit | c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6 (patch) | |
| tree | 60f4851429a445366de41c73798afcde0cc5c28c /sound/soc/intel/skylake/skl-messages.c | |
| parent | ASoC: sof: Fix warning when IPC flood test is not enabled (diff) | |
| parent | ASoC: SOF: Intel: Initialize hdaudio bus properly (diff) | |
| download | linux-c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6.tar.xz linux-c2f16a94a80497e4b28c27f9ca2cd6cd60706fb6.zip | |
Merge branch 'topic/hda-bus-ops-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4
Diffstat (limited to 'sound/soc/intel/skylake/skl-messages.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-messages.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index 84f0e6f58eb5..d43496c5f29e 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -25,23 +25,12 @@ static int skl_alloc_dma_buf(struct device *dev, struct snd_dma_buffer *dmab, size_t size) { - struct hdac_bus *bus = dev_get_drvdata(dev); - - if (!bus) - return -ENODEV; - - return bus->io_ops->dma_alloc_pages(bus, SNDRV_DMA_TYPE_DEV, size, dmab); + return snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, dev, size, dmab); } static int skl_free_dma_buf(struct device *dev, struct snd_dma_buffer *dmab) { - struct hdac_bus *bus = dev_get_drvdata(dev); - - if (!bus) - return -ENODEV; - - bus->io_ops->dma_free_pages(bus, dmab); - + snd_dma_free_pages(dmab); return 0; } |