Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (22 commits)
  ALSA: hda - Cirrus Logic CS421x support
  ALSA: Make pcm.h self-contained
  ALSA: hda - Allow codec-specific set_power_state ops
  ALSA: hda - Add post_suspend patch ops
  ALSA: hda - Make CONFIG_SND_HDA_POWER_SAVE depending on CONFIG_PM
  ALSA: hda - Make sure mute led reflects master mute state
  ALSA: hda - Fix invalid mute led state on resume of IDT codecs
  ASoC: Revert "ASoC: SAMSUNG: Add I2S0 internal dma driver"
  ALSA: hda - Add support of the 4 internal speakers on certain HP laptops
  ALSA: Make snd_pcm_debug_name usable outside pcm_lib
  ALSA: hda - Fix DAC filling for multi-connection pins in Realtek parser
  ASoC: dapm - Add methods to retrieve snd_card and soc_card from dapm context.
  ASoC: SAMSUNG: Add I2S0 internal dma driver
  ASoC: SAMSUNG: Modify I2S driver to support idma
  ASoC: davinci: add missing break statement
  ASoC: davinci: fix codec start and stop functions
  ASoC: dapm - add DAPM macro for external enum widgets
  ASoC: Acknowledge WM8962 interrupts before acting on them
  ASoC: sgtl5000: guide user when regulator support is needed
  ASoC: sgtl5000: refactor registering internal ldo
  ...

1 files changed, 8 insertions, 5 deletions

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index f1341308beda..86d0caf91b35 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -128,7 +128,8 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram
         }
 }
 
-static void pcm_debug_name(struct snd_pcm_substream *substream,
+#ifdef CONFIG_SND_DEBUG
+void snd_pcm_debug_name(struct snd_pcm_substream *substream,
                            char *name, size_t len)
 {
         snprintf(name, len, "pcmC%dD%d%c:%d",
@@ -137,6 +138,8 @@ static void pcm_debug_name(struct snd_pcm_substream *substream,
                  substream->stream ? 'c' : 'p',
                  substream->number);
 }
+EXPORT_SYMBOL(snd_pcm_debug_name);
+#endif
 
 #define XRUN_DEBUG_BASIC        (1<<0)
 #define XRUN_DEBUG_STACK        (1<<1)  /* dump also stack */
@@ -168,7 +171,7 @@ static void xrun(struct snd_pcm_substream *substream)
         snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
         if (xrun_debug(substream, XRUN_DEBUG_BASIC)) {
                 char name[16];
-                pcm_debug_name(substream, name, sizeof(name));
+                snd_pcm_debug_name(substream, name, sizeof(name));
                 snd_printd(KERN_DEBUG "XRUN: %s\n", name);
                 dump_stack_on_xrun(substream);
         }
@@ -243,7 +246,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
                 return;
         if (xrun_debug(substream, XRUN_DEBUG_LOGONCE) && log->hit)
                 return;
-        pcm_debug_name(substream, name, sizeof(name));
+        snd_pcm_debug_name(substream, name, sizeof(name));
         for (cnt = 0, idx = log->idx; cnt < XRUN_LOG_CNT; cnt++) {
                 entry = &log->entries[idx];
                 if (entry->period_size == 0)
@@ -319,7 +322,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
         if (pos >= runtime->buffer_size) {
                 if (printk_ratelimit()) {
                         char name[16];
-                        pcm_debug_name(substream, name, sizeof(name));
+                        snd_pcm_debug_name(substream, name, sizeof(name));
                         xrun_log_show(substream);
                         snd_printd(KERN_ERR  "BUG: %s, pos = %ld, "
                                    "buffer size = %ld, period size = %ld\n",
@@ -364,7 +367,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
         if (xrun_debug(substream, in_interrupt ?
                         XRUN_DEBUG_PERIODUPDATE : XRUN_DEBUG_HWPTRUPDATE)) {
                 char name[16];
-                pcm_debug_name(substream, name, sizeof(name));
+                snd_pcm_debug_name(substream, name, sizeof(name));
                 snd_printd("%s_update: %s: pos=%u/%u/%u, "
                            "hwptr=%ld/%ld/%ld/%ld\n",
                            in_interrupt ? "period" : "hwptr",