diff options
author | Wu Fengguang <wfg@linux.intel.com> | 2008-11-21 20:40:57 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-22 05:16:15 -0500 |
commit | 4805286bffa9d7b85223ab2038f08b4b6322a176 (patch) | |
tree | f115c262d79a61d5ebcd97b1a0c55b346ec4d253 /sound/pci/hda/hda_eld.c | |
parent | 9415e1c418b33bf9b8d8903fb98876ec72673e3f (diff) |
ALSA: hda - fix build warning when CONFIG_PROC_FS=n
Fix "defined but not used" build warning by moving eld_versoin_names[]
and cea_edid_version_names[] into hdmi_print_eld_info().
Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_eld.c')
-rw-r--r-- | sound/pci/hda/hda_eld.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c index aa438562efc7..fcad5ec31773 100644 --- a/sound/pci/hda/hda_eld.c +++ b/sound/pci/hda/hda_eld.c | |||
@@ -32,14 +32,6 @@ enum eld_versions { | |||
32 | ELD_VER_PARTIAL = 31, | 32 | ELD_VER_PARTIAL = 31, |
33 | }; | 33 | }; |
34 | 34 | ||
35 | static char *eld_versoin_names[32] = { | ||
36 | "reserved", | ||
37 | "reserved", | ||
38 | "CEA-861D or below", | ||
39 | [3 ... 30] = "reserved", | ||
40 | [31] = "partial" | ||
41 | }; | ||
42 | |||
43 | enum cea_edid_versions { | 35 | enum cea_edid_versions { |
44 | CEA_EDID_VER_NONE = 0, | 36 | CEA_EDID_VER_NONE = 0, |
45 | CEA_EDID_VER_CEA861 = 1, | 37 | CEA_EDID_VER_CEA861 = 1, |
@@ -48,14 +40,6 @@ enum cea_edid_versions { | |||
48 | CEA_EDID_VER_RESERVED = 4, | 40 | CEA_EDID_VER_RESERVED = 4, |
49 | }; | 41 | }; |
50 | 42 | ||
51 | static char *cea_edid_version_names[8] = { | ||
52 | "no CEA EDID Timing Extension block present", | ||
53 | "CEA-861", | ||
54 | "CEA-861-A", | ||
55 | "CEA-861-B, C or D", | ||
56 | [4 ... 7] = "reserved" | ||
57 | }; | ||
58 | |||
59 | static char *cea_speaker_allocation_names[] = { | 43 | static char *cea_speaker_allocation_names[] = { |
60 | /* 0 */ "FL/FR", | 44 | /* 0 */ "FL/FR", |
61 | /* 1 */ "LFE", | 45 | /* 1 */ "LFE", |
@@ -478,6 +462,20 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry, | |||
478 | struct hdmi_eld *e = entry->private_data; | 462 | struct hdmi_eld *e = entry->private_data; |
479 | char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; | 463 | char buf[SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE]; |
480 | int i; | 464 | int i; |
465 | static char *eld_versoin_names[32] = { | ||
466 | "reserved", | ||
467 | "reserved", | ||
468 | "CEA-861D or below", | ||
469 | [3 ... 30] = "reserved", | ||
470 | [31] = "partial" | ||
471 | }; | ||
472 | static char *cea_edid_version_names[8] = { | ||
473 | "no CEA EDID Timing Extension block present", | ||
474 | "CEA-861", | ||
475 | "CEA-861-A", | ||
476 | "CEA-861-B, C or D", | ||
477 | [4 ... 7] = "reserved" | ||
478 | }; | ||
481 | 479 | ||
482 | snd_iprintf(buffer, "monitor_name\t\t%s\n", e->monitor_name); | 480 | snd_iprintf(buffer, "monitor_name\t\t%s\n", e->monitor_name); |
483 | snd_iprintf(buffer, "connection_type\t\t%s\n", | 481 | snd_iprintf(buffer, "connection_type\t\t%s\n", |