diff options
| author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
| commit | 284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch) | |
| tree | 06c1b5a0f83c90cfb662f756e7781977ce739ce8 /sound/soc/blackfin | |
| parent | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff) | |
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/soc/blackfin')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ac97-pcm.c | 4 | ||||
| -rw-r--r-- | sound/soc/blackfin/bf5xx-i2s-pcm.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c index 8cfed1a5dcbe..cf0dfb7ca221 100644 --- a/sound/soc/blackfin/bf5xx-ac97-pcm.c +++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c | |||
| @@ -413,7 +413,7 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm) | |||
| 413 | sport_done(sport_handle); | 413 | sport_done(sport_handle); |
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | static u64 bf5xx_pcm_dmamask = DMA_32BIT_MASK; | 416 | static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32); |
| 417 | 417 | ||
| 418 | int bf5xx_pcm_ac97_new(struct snd_card *card, struct snd_soc_dai *dai, | 418 | int bf5xx_pcm_ac97_new(struct snd_card *card, struct snd_soc_dai *dai, |
| 419 | struct snd_pcm *pcm) | 419 | struct snd_pcm *pcm) |
| @@ -424,7 +424,7 @@ int bf5xx_pcm_ac97_new(struct snd_card *card, struct snd_soc_dai *dai, | |||
| 424 | if (!card->dev->dma_mask) | 424 | if (!card->dev->dma_mask) |
| 425 | card->dev->dma_mask = &bf5xx_pcm_dmamask; | 425 | card->dev->dma_mask = &bf5xx_pcm_dmamask; |
| 426 | if (!card->dev->coherent_dma_mask) | 426 | if (!card->dev->coherent_dma_mask) |
| 427 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | 427 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
| 428 | 428 | ||
| 429 | if (dai->playback.channels_min) { | 429 | if (dai->playback.channels_min) { |
| 430 | ret = bf5xx_pcm_preallocate_dma_buffer(pcm, | 430 | ret = bf5xx_pcm_preallocate_dma_buffer(pcm, |
diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c index 1318c4f627b7..62fbb8459569 100644 --- a/sound/soc/blackfin/bf5xx-i2s-pcm.c +++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c | |||
| @@ -245,7 +245,7 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm) | |||
| 245 | sport_done(sport_handle); | 245 | sport_done(sport_handle); |
| 246 | } | 246 | } |
| 247 | 247 | ||
| 248 | static u64 bf5xx_pcm_dmamask = DMA_32BIT_MASK; | 248 | static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32); |
| 249 | 249 | ||
| 250 | int bf5xx_pcm_i2s_new(struct snd_card *card, struct snd_soc_dai *dai, | 250 | int bf5xx_pcm_i2s_new(struct snd_card *card, struct snd_soc_dai *dai, |
| 251 | struct snd_pcm *pcm) | 251 | struct snd_pcm *pcm) |
| @@ -256,7 +256,7 @@ int bf5xx_pcm_i2s_new(struct snd_card *card, struct snd_soc_dai *dai, | |||
| 256 | if (!card->dev->dma_mask) | 256 | if (!card->dev->dma_mask) |
| 257 | card->dev->dma_mask = &bf5xx_pcm_dmamask; | 257 | card->dev->dma_mask = &bf5xx_pcm_dmamask; |
| 258 | if (!card->dev->coherent_dma_mask) | 258 | if (!card->dev->coherent_dma_mask) |
| 259 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | 259 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
| 260 | 260 | ||
| 261 | if (dai->playback.channels_min) { | 261 | if (dai->playback.channels_min) { |
| 262 | ret = bf5xx_pcm_preallocate_dma_buffer(pcm, | 262 | ret = bf5xx_pcm_preallocate_dma_buffer(pcm, |