aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s6000/s6000-pcm.c
diff options
context:
space:
mode:
authorMarin Mitov <mitov@issp.bas.bg>2009-11-16 14:39:26 -0500
committerTakashi Iwai <tiwai@suse.de>2009-11-17 03:04:06 -0500
commitf9ede4eca01cc64ce37549c282b6fde727c0ec84 (patch)
treefb323d6e06ee06680416890011ce8bc7c11b82a5 /sound/soc/s6000/s6000-pcm.c
parentc871a05315d1a76034ea06feeda92081e1d608bf (diff)
ASoC: Use DMA_BIT_MASK(32) instead of deprecated DMA_32BIT_MASK
Signed-off-by: Marin Mitov <mitov@issp.bas.bg> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/s6000/s6000-pcm.c')
-rw-r--r--sound/soc/s6000/s6000-pcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index 83b8028e209d..0eb1722f6581 100644
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
@@ -423,7 +423,7 @@ static void s6000_pcm_free(struct snd_pcm *pcm)
423 snd_pcm_lib_preallocate_free_for_all(pcm); 423 snd_pcm_lib_preallocate_free_for_all(pcm);
424} 424}
425 425
426static u64 s6000_pcm_dmamask = DMA_32BIT_MASK; 426static u64 s6000_pcm_dmamask = DMA_BIT_MASK(32);
427 427
428static int s6000_pcm_new(struct snd_card *card, 428static int s6000_pcm_new(struct snd_card *card,
429 struct snd_soc_dai *dai, struct snd_pcm *pcm) 429 struct snd_soc_dai *dai, struct snd_pcm *pcm)
@@ -435,7 +435,7 @@ static int s6000_pcm_new(struct snd_card *card,
435 if (!card->dev->dma_mask) 435 if (!card->dev->dma_mask)
436 card->dev->dma_mask = &s6000_pcm_dmamask; 436 card->dev->dma_mask = &s6000_pcm_dmamask;
437 if (!card->dev->coherent_dma_mask) 437 if (!card->dev->coherent_dma_mask)
438 card->dev->coherent_dma_mask = DMA_32BIT_MASK; 438 card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
439 439
440 if (params->dma_in) { 440 if (params->dma_in) {
441 s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in), 441 s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in),