diff options
author | Barry Song <21cnbao@gmail.com> | 2009-07-29 03:03:16 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-29 16:31:53 -0400 |
commit | 3a39f832a5699d50a6785de97c551033cc09d0ec (patch) | |
tree | 0948d834e6a60aa8316c7541ec4dbb79a84f1eb2 /sound/soc/blackfin | |
parent | c8489c3ed319677f23e5387fec09c844365566e8 (diff) |
ASoC: Fix checkpatch issues and typos of ad1938 codec and bf5xx-tdm dai
1. fix "line over 80 characters" checkpatch warnings
2. ‘DMA_nnBIT_MASK’ is deprecated, use DMA_BIT_MASK instead
3. fix typos
Signed-off-by: Barry Song <21cnbao@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/blackfin')
-rw-r--r-- | sound/soc/blackfin/bf5xx-tdm-pcm.c | 4 | ||||
-rw-r--r-- | sound/soc/blackfin/bf5xx-tdm-pcm.h | 2 | ||||
-rw-r--r-- | sound/soc/blackfin/bf5xx-tdm.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.c b/sound/soc/blackfin/bf5xx-tdm-pcm.c index af7fa8d7ff0d..ccb5e823bd18 100644 --- a/sound/soc/blackfin/bf5xx-tdm-pcm.c +++ b/sound/soc/blackfin/bf5xx-tdm-pcm.c | |||
@@ -276,7 +276,7 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm) | |||
276 | sport_done(sport_handle); | 276 | sport_done(sport_handle); |
277 | } | 277 | } |
278 | 278 | ||
279 | static u64 bf5xx_pcm_dmamask = DMA_32BIT_MASK; | 279 | static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32); |
280 | 280 | ||
281 | static int bf5xx_pcm_tdm_new(struct snd_card *card, struct snd_soc_dai *dai, | 281 | static int bf5xx_pcm_tdm_new(struct snd_card *card, struct snd_soc_dai *dai, |
282 | struct snd_pcm *pcm) | 282 | struct snd_pcm *pcm) |
@@ -286,7 +286,7 @@ static int bf5xx_pcm_tdm_new(struct snd_card *card, struct snd_soc_dai *dai, | |||
286 | if (!card->dev->dma_mask) | 286 | if (!card->dev->dma_mask) |
287 | card->dev->dma_mask = &bf5xx_pcm_dmamask; | 287 | card->dev->dma_mask = &bf5xx_pcm_dmamask; |
288 | if (!card->dev->coherent_dma_mask) | 288 | if (!card->dev->coherent_dma_mask) |
289 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | 289 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
290 | 290 | ||
291 | if (dai->playback.channels_min) { | 291 | if (dai->playback.channels_min) { |
292 | ret = bf5xx_pcm_preallocate_dma_buffer(pcm, | 292 | ret = bf5xx_pcm_preallocate_dma_buffer(pcm, |
diff --git a/sound/soc/blackfin/bf5xx-tdm-pcm.h b/sound/soc/blackfin/bf5xx-tdm-pcm.h index 9e8473d1c389..ddc5047df88c 100644 --- a/sound/soc/blackfin/bf5xx-tdm-pcm.h +++ b/sound/soc/blackfin/bf5xx-tdm-pcm.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/sound/arm/bf5xx-tdm-pcm.h -- ALSA PCM interface for the Blackfin | 2 | * sound/soc/blackfin/bf5xx-tdm-pcm.h -- ALSA PCM interface for the Blackfin |
3 | * | 3 | * |
4 | * Copyright 2009 Analog Device Inc. | 4 | * Copyright 2009 Analog Device Inc. |
5 | * | 5 | * |
diff --git a/sound/soc/blackfin/bf5xx-tdm.h b/sound/soc/blackfin/bf5xx-tdm.h index e5157cd81c5e..618ec3d90cd4 100644 --- a/sound/soc/blackfin/bf5xx-tdm.h +++ b/sound/soc/blackfin/bf5xx-tdm.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/sound/arm/bf5xx-i2s.h | 2 | * sound/soc/blackfin/bf5xx-tdm.h |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |