diff options
| author | Mark Brown <broonie@kernel.org> | 2016-10-25 22:25:42 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-25 22:25:42 +0300 |
| commit | a0a594369c8fc09786bb14772207303e70ccca9a (patch) | |
| tree | b4cce6f9e8eb7470bbedb5891d33c96c07bd5086 /include | |
| parent | 892ccf0f2173a9ede5448411e9475616fb21fb51 (diff) | |
| parent | c6644119a3f80ea644bde10009d5e1013b5aff29 (diff) | |
| download | linux-a0a594369c8fc09786bb14772207303e70ccca9a.tar.xz | |
Merge branch 'topic/dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
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 |