summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Wu <cooloney@kernel.org>2008-11-18 09:18:21 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-11-18 13:32:32 +0100
commit27b9be5a7894f571bbfb87de19ad7cd8c7737d22 (patch)
tree5efdcf8fa690ad314fbc0e1502640afbf38e3849
parentASoC: Blackfin: do not force TWI bus for ssm2602 codec (diff)
downloadlinux-27b9be5a7894f571bbfb87de19ad7cd8c7737d22.tar.xz
linux-27b9be5a7894f571bbfb87de19ad7cd8c7737d22.zip
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>
-rw-r--r--sound/soc/blackfin/bf5xx-ac97-pcm.c9
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)
* The total rx/tx buffer is for ac97 frame to hold all pcm data
* is 0x20000 * sizeof(struct ac97_frame) / 4.
*/
-#if defined(CONFIG_SND_BF5XX_MMAP_SUPPORT)
static const struct snd_pcm_hardware bf5xx_pcm_hardware = {
.info = SNDRV_PCM_INFO_INTERLEAVED |
+#if defined(CONFIG_SND_BF5XX_MMAP_SUPPORT)
SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
- SNDRV_PCM_INFO_BLOCK_TRANSFER,
-#else
-static const struct snd_pcm_hardware bf5xx_pcm_hardware = {
- .info = SNDRV_PCM_INFO_INTERLEAVED |
- SNDRV_PCM_INFO_BLOCK_TRANSFER,
#endif
+ SNDRV_PCM_INFO_BLOCK_TRANSFER,
+
.formats = SNDRV_PCM_FMTBIT_S16_LE,
.period_bytes_min = 32,
.period_bytes_max = 0x10000,