diff options
author | Bryan Wu <cooloney@kernel.org> | 2008-11-18 03:18:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-11-18 07:32:32 -0500 |
commit | 27b9be5a7894f571bbfb87de19ad7cd8c7737d22 (patch) | |
tree | 5efdcf8fa690ad314fbc0e1502640afbf38e3849 /sound/soc/blackfin/bf5xx-ac97-pcm.c | |
parent | caa45836d6bdfde603f3afd739ec3fc2360b1dac (diff) |
ASoC: Blackfin: Simplify the MMAP_SUPPORT macros protected code
Cc: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ac97-pcm.c')
-rw-r--r-- | sound/soc/blackfin/bf5xx-ac97-pcm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c index 4d25f73274e8..d3d51bcb4569 100644 --- a/sound/soc/blackfin/bf5xx-ac97-pcm.c +++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c | |||
@@ -100,17 +100,14 @@ static void bf5xx_dma_irq(void *data) | |||
100 | * The total rx/tx buffer is for ac97 frame to hold all pcm data | 100 | * The total rx/tx buffer is for ac97 frame to hold all pcm data |
101 | * is 0x20000 * sizeof(struct ac97_frame) / 4. | 101 | * is 0x20000 * sizeof(struct ac97_frame) / 4. |
102 | */ | 102 | */ |
103 | #if defined(CONFIG_SND_BF5XX_MMAP_SUPPORT) | ||
104 | static const struct snd_pcm_hardware bf5xx_pcm_hardware = { | 103 | static const struct snd_pcm_hardware bf5xx_pcm_hardware = { |
105 | .info = SNDRV_PCM_INFO_INTERLEAVED | | 104 | .info = SNDRV_PCM_INFO_INTERLEAVED | |
105 | #if defined(CONFIG_SND_BF5XX_MMAP_SUPPORT) | ||
106 | SNDRV_PCM_INFO_MMAP | | 106 | SNDRV_PCM_INFO_MMAP | |
107 | SNDRV_PCM_INFO_MMAP_VALID | | 107 | SNDRV_PCM_INFO_MMAP_VALID | |
108 | SNDRV_PCM_INFO_BLOCK_TRANSFER, | ||
109 | #else | ||
110 | static const struct snd_pcm_hardware bf5xx_pcm_hardware = { | ||
111 | .info = SNDRV_PCM_INFO_INTERLEAVED | | ||
112 | SNDRV_PCM_INFO_BLOCK_TRANSFER, | ||
113 | #endif | 108 | #endif |
109 | SNDRV_PCM_INFO_BLOCK_TRANSFER, | ||
110 | |||
114 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 111 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
115 | .period_bytes_min = 32, | 112 | .period_bytes_min = 32, |
116 | .period_bytes_max = 0x10000, | 113 | .period_bytes_max = 0x10000, |