openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: switch davinci DPRINTK to pr_debug() 

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Alexander Beregalov 2008-12-13 16:25:27 +03:00 committed by Mark Brown
parent 49d92c7d5b
commit 9cd28ab005
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/soc/davinci/davinci-pcm.c
View File

@ -14,6 +14,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/kernel.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
@ -24,13 +25,6 @@
#include "davinci-pcm.h" #include "davinci-pcm.h"
#define DAVINCI_PCM_DEBUG 0
#if DAVINCI_PCM_DEBUG
#define DPRINTK(x...) printk(KERN_DEBUG x)
#else
#define DPRINTK(x...)
#endif
static struct snd_pcm_hardware davinci_pcm_hardware = { static struct snd_pcm_hardware davinci_pcm_hardware = {
.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | .info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
@ -78,8 +72,8 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream)
dma_offset = prtd->period * period_size; dma_offset = prtd->period * period_size;
dma_pos = runtime->dma_addr + dma_offset; dma_pos = runtime->dma_addr + dma_offset;
DPRINTK("audio_set_dma_params_play channel = %d dma_ptr = %x " pr_debug("davinci_pcm: audio_set_dma_params_play channel = %d "
"period_size=%x\n", lch, dma_pos, period_size); "dma_ptr = %x period_size=%x\n", lch, dma_pos, period_size);
data_type = prtd->params->data_type; data_type = prtd->params->data_type;
count = period_size / data_type; count = period_size / data_type;
@ -112,7 +106,7 @@ static void davinci_pcm_dma_irq(int lch, u16 ch_status, void *data)
struct snd_pcm_substream *substream = data; struct snd_pcm_substream *substream = data;
struct davinci_runtime_data *prtd = substream->runtime->private_data; struct davinci_runtime_data *prtd = substream->runtime->private_data;
DPRINTK("lch=%d, status=0x%x\n", lch, ch_status); pr_debug("davinci_pcm: lch=%d, status=0x%x\n", lch, ch_status);
if (unlikely(ch_status != DMA_COMPLETE)) if (unlikely(ch_status != DMA_COMPLETE))
return; return;
@ -316,8 +310,8 @@ static int davinci_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
buf->area = dma_alloc_writecombine(pcm->card->dev, size, buf->area = dma_alloc_writecombine(pcm->card->dev, size,
&buf->addr, GFP_KERNEL); &buf->addr, GFP_KERNEL);
DPRINTK("preallocate_dma_buffer: area=%p, addr=%p, size=%d\n", pr_debug("davinci_pcm: preallocate_dma_buffer: area=%p, addr=%p, "
(void *) buf->area, (void *) buf->addr, size); "size=%d\n", (void *) buf->area, (void *) buf->addr, size);
if (!buf->area) if (!buf->area)
return -ENOMEM; return -ENOMEM;