Skip to content

L
linux-davinci
Commit f24368c2 authored by Mark Brown's avatar Mark Brown
Browse files
Options

ASoC: Convert core to use standard debug print macros 

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d45f6219
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 22 deletions
sound/soc/soc-core.c
View file @ f24368c2
...@@ -35,14 +35,6 @@ ...@@ -35,14 +35,6 @@
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
#include <sound/initval.h> #include <sound/initval.h>
/* debug */
#define SOC_DEBUG 0
#if SOC_DEBUG
#define dbg(format, arg...) printk(format, ## arg)
#else
#define dbg(format, arg...)
#endif
static DEFINE_MUTEX(pcm_mutex); static DEFINE_MUTEX(pcm_mutex);
static DEFINE_MUTEX(io_mutex); static DEFINE_MUTEX(io_mutex);
static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq); static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq);
...@@ -229,11 +221,11 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) ...@@ -229,11 +221,11 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
goto machine_err; goto machine_err;
} }
dbg("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name); pr_debug("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name);
dbg("asoc: rate mask 0x%x\n", runtime->hw.rates); pr_debug("asoc: rate mask 0x%x\n", runtime->hw.rates);
dbg("asoc: min ch %d max ch %d\n", runtime->hw.channels_min, pr_debug("asoc: min ch %d max ch %d\n", runtime->hw.channels_min,
runtime->hw.channels_max); runtime->hw.channels_max);
dbg("asoc: min rate %d max rate %d\n", runtime->hw.rate_min, pr_debug("asoc: min rate %d max rate %d\n", runtime->hw.rate_min,
runtime->hw.rate_max); runtime->hw.rate_max);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
...@@ -279,7 +271,7 @@ static void close_delayed_work(struct work_struct *work) ...@@ -279,7 +271,7 @@ static void close_delayed_work(struct work_struct *work)
for (i = 0; i < codec->num_dai; i++) { for (i = 0; i < codec->num_dai; i++) {
codec_dai = &codec->dai[i]; codec_dai = &codec->dai[i];
dbg("pop wq checking: %s status: %s waiting: %s\n", pr_debug("pop wq checking: %s status: %s waiting: %s\n",
codec_dai->playback.stream_name, codec_dai->playback.stream_name,
codec_dai->playback.active ? "active" : "inactive", codec_dai->playback.active ? "active" : "inactive",
codec_dai->pop_wait ? "yes" : "no"); codec_dai->pop_wait ? "yes" : "no");
...@@ -289,7 +281,7 @@ static void close_delayed_work(struct work_struct *work) ...@@ -289,7 +281,7 @@ static void close_delayed_work(struct work_struct *work)
/* Reduce power if no longer active */ /* Reduce power if no longer active */
if (codec->active == 0) { if (codec->active == 0) {
dbg("pop wq D1 %s %s\n", codec->name, pr_debug("pop wq D1 %s %s\n", codec->name,
codec_dai->playback.stream_name); codec_dai->playback.stream_name);
snd_soc_dapm_set_bias_level(socdev, snd_soc_dapm_set_bias_level(socdev,
SND_SOC_BIAS_PREPARE); SND_SOC_BIAS_PREPARE);
...@@ -302,7 +294,7 @@ static void close_delayed_work(struct work_struct *work) ...@@ -302,7 +294,7 @@ static void close_delayed_work(struct work_struct *work)
/* Fall into standby if no longer active */ /* Fall into standby if no longer active */
if (codec->active == 0) { if (codec->active == 0) {
dbg("pop wq D3 %s %s\n", codec->name, pr_debug("pop wq D3 %s %s\n", codec->name,
codec_dai->playback.stream_name); codec_dai->playback.stream_name);
snd_soc_dapm_set_bias_level(socdev, snd_soc_dapm_set_bias_level(socdev,
SND_SOC_BIAS_STANDBY); SND_SOC_BIAS_STANDBY);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment