diff options
author | Joachim Eastwood <joachim.eastwood@jotron.com> | 2011-12-31 20:43:03 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-20 08:58:26 -0500 |
commit | 350e16d5293b54e2ef105ebd777f43dbe5a15ffa (patch) | |
tree | f5afacc9cdf4dff3c15a9529c45a0d4852d82e4e /sound | |
parent | 6296914ccefe6efefee811436dd7cfad6545f2eb (diff) |
ASoC: replace 0xffffffff with DMA_BIT_MASK macro
Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/atmel/atmel-pcm.c | 4 | ||||
-rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 4 | ||||
-rw-r--r-- | sound/soc/ep93xx/ep93xx-pcm.c | 4 | ||||
-rw-r--r-- | sound/soc/fsl/mpc5200_dma.c | 4 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood-dma.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/dma.c | 2 | ||||
-rw-r--r-- | sound/soc/tegra/tegra_pcm.c | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c index a21ff459e5d3..9b84f985770e 100644 --- a/sound/soc/atmel/atmel-pcm.c +++ b/sound/soc/atmel/atmel-pcm.c | |||
@@ -362,7 +362,7 @@ static struct snd_pcm_ops atmel_pcm_ops = { | |||
362 | /*--------------------------------------------------------------------------*\ | 362 | /*--------------------------------------------------------------------------*\ |
363 | * ASoC platform driver | 363 | * ASoC platform driver |
364 | \*--------------------------------------------------------------------------*/ | 364 | \*--------------------------------------------------------------------------*/ |
365 | static u64 atmel_pcm_dmamask = 0xffffffff; | 365 | static u64 atmel_pcm_dmamask = DMA_BIT_MASK(32); |
366 | 366 | ||
367 | static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) | 367 | static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) |
368 | { | 368 | { |
@@ -373,7 +373,7 @@ static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
373 | if (!card->dev->dma_mask) | 373 | if (!card->dev->dma_mask) |
374 | card->dev->dma_mask = &atmel_pcm_dmamask; | 374 | card->dev->dma_mask = &atmel_pcm_dmamask; |
375 | if (!card->dev->coherent_dma_mask) | 375 | if (!card->dev->coherent_dma_mask) |
376 | card->dev->coherent_dma_mask = 0xffffffff; | 376 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
377 | 377 | ||
378 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { | 378 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { |
379 | ret = atmel_pcm_preallocate_dma_buffer(pcm, | 379 | ret = atmel_pcm_preallocate_dma_buffer(pcm, |
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index b26401f87b85..97d77b298968 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c | |||
@@ -826,7 +826,7 @@ static void davinci_pcm_free(struct snd_pcm *pcm) | |||
826 | } | 826 | } |
827 | } | 827 | } |
828 | 828 | ||
829 | static u64 davinci_pcm_dmamask = 0xffffffff; | 829 | static u64 davinci_pcm_dmamask = DMA_BIT_MASK(32); |
830 | 830 | ||
831 | static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd) | 831 | static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd) |
832 | { | 832 | { |
@@ -837,7 +837,7 @@ static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
837 | if (!card->dev->dma_mask) | 837 | if (!card->dev->dma_mask) |
838 | card->dev->dma_mask = &davinci_pcm_dmamask; | 838 | card->dev->dma_mask = &davinci_pcm_dmamask; |
839 | if (!card->dev->coherent_dma_mask) | 839 | if (!card->dev->coherent_dma_mask) |
840 | card->dev->coherent_dma_mask = 0xffffffff; | 840 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
841 | 841 | ||
842 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { | 842 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { |
843 | ret = davinci_pcm_preallocate_dma_buffer(pcm, | 843 | ret = davinci_pcm_preallocate_dma_buffer(pcm, |
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c index de8390449873..32adca38b48b 100644 --- a/sound/soc/ep93xx/ep93xx-pcm.c +++ b/sound/soc/ep93xx/ep93xx-pcm.c | |||
@@ -281,7 +281,7 @@ static void ep93xx_pcm_free_dma_buffers(struct snd_pcm *pcm) | |||
281 | } | 281 | } |
282 | } | 282 | } |
283 | 283 | ||
284 | static u64 ep93xx_pcm_dmamask = 0xffffffff; | 284 | static u64 ep93xx_pcm_dmamask = DMA_BIT_MASK(32); |
285 | 285 | ||
286 | static int ep93xx_pcm_new(struct snd_soc_pcm_runtime *rtd) | 286 | static int ep93xx_pcm_new(struct snd_soc_pcm_runtime *rtd) |
287 | { | 287 | { |
@@ -292,7 +292,7 @@ static int ep93xx_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
292 | if (!card->dev->dma_mask) | 292 | if (!card->dev->dma_mask) |
293 | card->dev->dma_mask = &ep93xx_pcm_dmamask; | 293 | card->dev->dma_mask = &ep93xx_pcm_dmamask; |
294 | if (!card->dev->coherent_dma_mask) | 294 | if (!card->dev->coherent_dma_mask) |
295 | card->dev->coherent_dma_mask = 0xffffffff; | 295 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
296 | 296 | ||
297 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { | 297 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { |
298 | ret = ep93xx_pcm_preallocate_dma_buffer(pcm, | 298 | ret = ep93xx_pcm_preallocate_dma_buffer(pcm, |
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index 2112e224a4ac..33adbf1e40d6 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c | |||
@@ -298,7 +298,7 @@ static struct snd_pcm_ops psc_dma_ops = { | |||
298 | .hw_params = psc_dma_hw_params, | 298 | .hw_params = psc_dma_hw_params, |
299 | }; | 299 | }; |
300 | 300 | ||
301 | static u64 psc_dma_dmamask = 0xffffffff; | 301 | static u64 psc_dma_dmamask = DMA_BIT_MASK(32); |
302 | static int psc_dma_new(struct snd_soc_pcm_runtime *rtd) | 302 | static int psc_dma_new(struct snd_soc_pcm_runtime *rtd) |
303 | { | 303 | { |
304 | struct snd_card *card = rtd->card->snd_card; | 304 | struct snd_card *card = rtd->card->snd_card; |
@@ -314,7 +314,7 @@ static int psc_dma_new(struct snd_soc_pcm_runtime *rtd) | |||
314 | if (!card->dev->dma_mask) | 314 | if (!card->dev->dma_mask) |
315 | card->dev->dma_mask = &psc_dma_dmamask; | 315 | card->dev->dma_mask = &psc_dma_dmamask; |
316 | if (!card->dev->coherent_dma_mask) | 316 | if (!card->dev->coherent_dma_mask) |
317 | card->dev->coherent_dma_mask = 0xffffffff; | 317 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
318 | 318 | ||
319 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { | 319 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { |
320 | rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev, | 320 | rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev, |
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c index d03854027128..b9f16598324c 100644 --- a/sound/soc/kirkwood/kirkwood-dma.c +++ b/sound/soc/kirkwood/kirkwood-dma.c | |||
@@ -55,7 +55,7 @@ static struct snd_pcm_hardware kirkwood_dma_snd_hw = { | |||
55 | .fifo_size = 0, | 55 | .fifo_size = 0, |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static u64 kirkwood_dma_dmamask = 0xFFFFFFFFUL; | 58 | static u64 kirkwood_dma_dmamask = DMA_BIT_MASK(32); |
59 | 59 | ||
60 | static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id) | 60 | static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id) |
61 | { | 61 | { |
@@ -324,7 +324,7 @@ static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd) | |||
324 | if (!card->dev->dma_mask) | 324 | if (!card->dev->dma_mask) |
325 | card->dev->dma_mask = &kirkwood_dma_dmamask; | 325 | card->dev->dma_mask = &kirkwood_dma_dmamask; |
326 | if (!card->dev->coherent_dma_mask) | 326 | if (!card->dev->coherent_dma_mask) |
327 | card->dev->coherent_dma_mask = 0xffffffff; | 327 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
328 | 328 | ||
329 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { | 329 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { |
330 | ret = kirkwood_dma_preallocate_dma_buffer(pcm, | 330 | ret = kirkwood_dma_preallocate_dma_buffer(pcm, |
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c index e4ba17ce6b32..ddc6cde14e2a 100644 --- a/sound/soc/samsung/dma.c +++ b/sound/soc/samsung/dma.c | |||
@@ -411,7 +411,7 @@ static int dma_new(struct snd_soc_pcm_runtime *rtd) | |||
411 | if (!card->dev->dma_mask) | 411 | if (!card->dev->dma_mask) |
412 | card->dev->dma_mask = &dma_mask; | 412 | card->dev->dma_mask = &dma_mask; |
413 | if (!card->dev->coherent_dma_mask) | 413 | if (!card->dev->coherent_dma_mask) |
414 | card->dev->coherent_dma_mask = 0xffffffff; | 414 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
415 | 415 | ||
416 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { | 416 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { |
417 | ret = preallocate_dma_buffer(pcm, | 417 | ret = preallocate_dma_buffer(pcm, |
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c index c22431516ab2..8b4457137c7c 100644 --- a/sound/soc/tegra/tegra_pcm.c +++ b/sound/soc/tegra/tegra_pcm.c | |||
@@ -336,7 +336,7 @@ static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
336 | if (!card->dev->dma_mask) | 336 | if (!card->dev->dma_mask) |
337 | card->dev->dma_mask = &tegra_dma_mask; | 337 | card->dev->dma_mask = &tegra_dma_mask; |
338 | if (!card->dev->coherent_dma_mask) | 338 | if (!card->dev->coherent_dma_mask) |
339 | card->dev->coherent_dma_mask = 0xffffffff; | 339 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
340 | 340 | ||
341 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { | 341 | if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { |
342 | ret = tegra_pcm_preallocate_dma_buffer(pcm, | 342 | ret = tegra_pcm_preallocate_dma_buffer(pcm, |