Loading sound/soc/soc-core.c +14 −22 Original line number Diff line number Diff line Loading @@ -35,14 +35,6 @@ #include <sound/soc-dapm.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(io_mutex); static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq); Loading Loading @@ -229,11 +221,11 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) goto machine_err; } dbg("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name); dbg("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: %s <-> %s info:\n", codec_dai->name, cpu_dai->name); pr_debug("asoc: rate mask 0x%x\n", runtime->hw.rates); pr_debug("asoc: min ch %d max ch %d\n", runtime->hw.channels_min, 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); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) Loading Loading @@ -279,7 +271,7 @@ static void close_delayed_work(struct work_struct *work) for (i = 0; i < codec->num_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.active ? "active" : "inactive", codec_dai->pop_wait ? "yes" : "no"); Loading @@ -289,7 +281,7 @@ static void close_delayed_work(struct work_struct *work) /* Reduce power if no longer active */ 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); snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_PREPARE); Loading @@ -302,7 +294,7 @@ static void close_delayed_work(struct work_struct *work) /* Fall into standby if no longer active */ 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); snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_STANDBY); Loading Loading
sound/soc/soc-core.c +14 −22 Original line number Diff line number Diff line Loading @@ -35,14 +35,6 @@ #include <sound/soc-dapm.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(io_mutex); static DECLARE_WAIT_QUEUE_HEAD(soc_pm_waitq); Loading Loading @@ -229,11 +221,11 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) goto machine_err; } dbg("asoc: %s <-> %s info:\n", codec_dai->name, cpu_dai->name); dbg("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: %s <-> %s info:\n", codec_dai->name, cpu_dai->name); pr_debug("asoc: rate mask 0x%x\n", runtime->hw.rates); pr_debug("asoc: min ch %d max ch %d\n", runtime->hw.channels_min, 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); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) Loading Loading @@ -279,7 +271,7 @@ static void close_delayed_work(struct work_struct *work) for (i = 0; i < codec->num_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.active ? "active" : "inactive", codec_dai->pop_wait ? "yes" : "no"); Loading @@ -289,7 +281,7 @@ static void close_delayed_work(struct work_struct *work) /* Reduce power if no longer active */ 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); snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_PREPARE); Loading @@ -302,7 +294,7 @@ static void close_delayed_work(struct work_struct *work) /* Fall into standby if no longer active */ 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); snd_soc_dapm_set_bias_level(socdev, SND_SOC_BIAS_STANDBY); Loading