diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:46 +0000 |
| commit | 14eec47753216e185396be5b0e6f04f274bfe4a5 (patch) | |
| tree | a705958bc9a154684440ac1482d642b6d2cf4bd4 /include | |
| parent | e6c6fd896bbe4fe8967c5ba6f2d5db056a1da688 (diff) | |
| parent | c6644119a3f80ea644bde10009d5e1013b5aff29 (diff) | |
| download | linux-rpi-14eec47753216e185396be5b0e6f04f274bfe4a5.tar.gz linux-rpi-14eec47753216e185396be5b0e6f04f274bfe4a5.tar.bz2 linux-rpi-14eec47753216e185396be5b0e6f04f274bfe4a5.zip | |
Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/dmaengine_pcm.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 67be2445941a..1c8f9e1ef2a5 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -71,7 +71,6 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream) * @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. * @fifo_size: FIFO size of the DAI controller in bytes * @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now */ @@ -81,7 +80,6 @@ struct snd_dmaengine_dai_dma_data { u32 maxburst; unsigned int slave_id; void *filter_data; - const char *chan_name; unsigned int fifo_size; unsigned int flags; }; @@ -107,10 +105,6 @@ void snd_dmaengine_pcm_set_config_from_dai_data( * playback. */ #define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3) -/* - * The PCM streams have custom channel names specified. - */ -#define SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME BIT(4) /** * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM |