aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx/s3c2412-i2s.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-06 13:04:34 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-06 13:04:34 -0500
commitee7d476714464206317d4420d67e3bfa0308448d (patch)
tree023355c0e09a8f1e0f5f40dac93d02afc2765b50 /sound/soc/s3c24xx/s3c2412-i2s.c
parent26bd7b496cabc232fcff9ae0249828420c52b5af (diff)
ASoC: Re-remove hand-rolled pr_debug() macros
The recent set of S3C64xx patches re-added a lot of uses of DBG() that had previously been removed - revert this so the standard pr_debug() macro is used. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/s3c2412-i2s.c')
-rw-r--r--sound/soc/s3c24xx/s3c2412-i2s.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c
index 5099d9396676..1ceae690d019 100644
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c
@@ -42,12 +42,6 @@
42 42
43#define S3C2412_I2S_DEBUG 0 43#define S3C2412_I2S_DEBUG 0
44 44
45#if S3C2412_I2S_DEBUG
46#define DBG(x...) printk(KERN_INFO x)
47#else
48#define DBG(x...) do { } while (0)
49#endif
50
51static struct s3c2410_dma_client s3c2412_dma_client_out = { 45static struct s3c2410_dma_client s3c2412_dma_client_out = {
52 .name = "I2S PCM Stereo out" 46 .name = "I2S PCM Stereo out"
53}; 47};
@@ -80,7 +74,7 @@ static int s3c2412_i2s_set_sysclk(struct snd_soc_dai *cpu_dai,
80{ 74{
81 u32 iismod = readl(s3c2412_i2s.regs + S3C2412_IISMOD); 75 u32 iismod = readl(s3c2412_i2s.regs + S3C2412_IISMOD);
82 76
83 DBG("%s(%p, %d, %u, %d)\n", __func__, cpu_dai, clk_id, 77 pr_debug("%s(%p, %d, %u, %d)\n", __func__, cpu_dai, clk_id,
84 freq, dir); 78 freq, dir);
85 79
86 switch (clk_id) { 80 switch (clk_id) {
@@ -115,7 +109,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev,
115{ 109{
116 int ret; 110 int ret;
117 111
118 DBG("Entered %s\n", __func__); 112 pr_debug("Entered %s\n", __func__);
119 113
120 ret = s3c_i2sv2_probe(pdev, dai, &s3c2412_i2s, S3C2410_PA_IIS); 114 ret = s3c_i2sv2_probe(pdev, dai, &s3c2412_i2s, S3C2410_PA_IIS);
121 if (ret) 115 if (ret)
@@ -126,7 +120,7 @@ static int s3c2412_i2s_probe(struct platform_device *pdev,
126 120
127 s3c2412_i2s.iis_cclk = clk_get(&pdev->dev, "i2sclk"); 121 s3c2412_i2s.iis_cclk = clk_get(&pdev->dev, "i2sclk");
128 if (s3c2412_i2s.iis_cclk == NULL) { 122 if (s3c2412_i2s.iis_cclk == NULL) {
129 DBG("failed to get i2sclk clock\n"); 123 pr_debug("failed to get i2sclk clock\n");
130 iounmap(s3c2412_i2s.regs); 124 iounmap(s3c2412_i2s.regs);
131 return -ENODEV; 125 return -ENODEV;
132 } 126 }