ALSA: hda: make global snd_print_channel_allocation()

code refactor: make a global function snd_print_channel_allocation().

Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index 7fa065cd1d9cf34bbfb36b02e3d0b2d5f17a18c1..18078de0abcc93c0de3b0cbaacfbcc07b3519ea6 100644 (file)
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -407,8 +407,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
                printk(KERN_INFO "profile: %d\n", a->profile);
 }
 
-#define HDMI_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80
-static void hdmi_print_channel_allocation(int spk_alloc, char *buf, int buflen)
+void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen)
 {
        int i, j;
 
@@ -425,7 +424,7 @@ static void hdmi_print_channel_allocation(int spk_alloc, char *buf, int buflen)
 void snd_hdmi_show_eld(struct sink_eld *e)
 {
        int i;
-       char buf[HDMI_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
+       char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
 
        printk(KERN_INFO "ELD buffer size  is %d\n", e->eld_size);
        printk(KERN_INFO "ELD baseline len is %d*4\n", e->baseline_len);
@@ -446,7 +445,7 @@ void snd_hdmi_show_eld(struct sink_eld *e)
                                eld_connection_type_names[e->conn_type]);
        printk(KERN_INFO "monitor name     is %s\n", e->monitor_name);
 
-       hdmi_print_channel_allocation(e->spk_alloc, buf, sizeof(buf));
+       snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf));
        printk(KERN_INFO "speaker allocations: (0x%x)%s\n", e->spk_alloc, buf);
 
        for (i = 0; i < e->sad_count; i++)
@@ -484,7 +483,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
                                struct snd_info_buffer *buffer)
 {
        struct sink_eld *e = entry->private_data;
-       char buf[HDMI_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
+       char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE];
        int i;
 
        snd_iprintf(buffer, "monitor name\t\t%s\n", e->monitor_name);
@@ -501,7 +500,7 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry,
        snd_iprintf(buffer, "support_ai\t\t%d\n", e->support_ai);
        snd_iprintf(buffer, "audio_sync_delay\t%d\n", e->aud_synch_delay);
 
-       hdmi_print_channel_allocation(e->spk_alloc, buf, sizeof(buf));
+       snd_print_channel_allocation(e->spk_alloc, buf, sizeof(buf));
        snd_iprintf(buffer, "speakers\t\t[0x%x] %s\n", e->spk_alloc, buf);
 
        snd_iprintf(buffer, "sad_count\t\t%d\n", e->sad_count);

diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 02ac7321e5e4de408ae6b9f14009f359c0a9ce11..0baa9b816ca81c45608cc4789ea4599e2c1d0a66 100644 (file)
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -493,4 +493,7 @@ inline int snd_hda_eld_proc_new(struct hda_codec *codec, struct sink_eld *eld)
 }
 #endif
 
+#define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80
+void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen);
+
 #endif /* __SOUND_HDA_LOCAL_H */