diff options
| author | Mark Brown <broonie@kernel.org> | 2021-12-17 14:13:39 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-12-17 14:13:39 +0300 |
| commit | 5a49d926da462caf2aef6681a6c987240fad7c16 (patch) | |
| tree | 0615d1f2c86ab0c17011194d876297a3a298ed0f /include/sound | |
| parent | 0f2ee77d2655bd4bb205fff16822e551159f41c9 (diff) | |
| parent | 3c219644075795a99271d345efdfa8b256e55161 (diff) | |
| download | linux-5a49d926da462caf2aef6681a6c987240fad7c16.tar.xz | |
Merge tag 'dmaengine_topic_slave_id_removal_5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine into v4_20211204_digetx_support_hdmi_audio_on_nvidia_tegra20
dmaengine_topic_slave_id_removal_5.17
Tag for dmaengine slave_id removal topic branch which should be merged
into v5.17
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/dmaengine_pcm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 96666efddb39..38ea046e653c 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -60,7 +60,6 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream) * @maxburst: Maximum number of words(note: words, as in units of the * src_addr_width member, not bytes) that can be send to or received from the * DAI in one burst. - * @slave_id: Slave requester id for the DMA channel. * @filter_data: Custom DMA channel filter data, this will usually be used when * requesting the DMA channel. * @chan_name: Custom channel name to use when requesting DMA channel. @@ -74,7 +73,6 @@ struct snd_dmaengine_dai_dma_data { dma_addr_t addr; enum dma_slave_buswidth addr_width; u32 maxburst; - unsigned int slave_id; void *filter_data; const char *chan_name; unsigned int fifo_size; |