diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-03-30 19:54:54 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-01 21:24:27 +0100 |
| commit | 488cb533911b96fe41af68a0206878aa46b799bc (patch) | |
| tree | 85d6408a59f870a79df3dfa62aaf4d235a8b6787 /sound/soc/atmel/atmel-pcm.h | |
| parent | b6d6c6e95ff0e78f9b8393e6b9f25d5a4341ae1a (diff) | |
| download | linux-488cb533911b96fe41af68a0206878aa46b799bc.tar.gz linux-488cb533911b96fe41af68a0206878aa46b799bc.tar.bz2 linux-488cb533911b96fe41af68a0206878aa46b799bc.zip | |
ASoC: atmel-pcm-pdc: merge atmel-pcm back in
atmel-pcm.c was split into two files to create a generic framework for both PDC
and DMA.
atmel-pcm-dma.c is using the generic dmaengine framework since 95e0e07e710e
(ASoC: atmel-pcm: use generic dmaengine framework).
Merge atmel-pcm.c in atmel-pcm-pdc.c as this is now the only user.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/atmel/atmel-pcm.h')
| -rw-r--r-- | sound/soc/atmel/atmel-pcm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h index 12ae814eff21..6eaf081cad50 100644 --- a/sound/soc/atmel/atmel-pcm.h +++ b/sound/soc/atmel/atmel-pcm.h @@ -83,11 +83,6 @@ struct atmel_pcm_dma_params { #define ssc_readx(base, reg) (__raw_readl((base) + (reg))) #define ssc_writex(base, reg, value) __raw_writel((value), (base) + (reg)) -int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd); -void atmel_pcm_free(struct snd_pcm *pcm); -int atmel_pcm_mmap(struct snd_pcm_substream *substream, - struct vm_area_struct *vma); - #if defined(CONFIG_SND_ATMEL_SOC_PDC) || \ defined(CONFIG_SND_ATMEL_SOC_PDC_MODULE) int atmel_pcm_pdc_platform_register(struct device *dev); |