diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-02-29 05:59:26 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:19 -0400 |
commit | 3c9a3203ff9863fbe798030928f496347c2ed3bd (patch) | |
tree | 1a38d2c9dfab80828bbc8414463c53391aa6257b /sound/pci/hda/hda_codec.c | |
parent | 64ed0dfd1f42edb15f4d18c13d7696edbc2f7e4c (diff) |
[ALSA] sound: hda: missing includes of hda_patch.h
Move the array declaration to hda_codec.c where it is used and add includes
where the individual presets are declared.
Fixes the following sparse warnings:
sound/pci/hda/patch_realtek.c:13744:25: warning: symbol 'snd_hda_preset_realtek' was not declared. Should it be static?
sound/pci/hda/patch_cmedia.c:729:25: warning: symbol 'snd_hda_preset_cmedia' was not declared. Should it be static?
sound/pci/hda/patch_analog.c:3656:25: warning: symbol 'snd_hda_preset_analog' was not declared. Should it be static?
sound/pci/hda/patch_sigmatel.c:3995:25: warning: symbol 'snd_hda_preset_sigmatel' was not declared. Should it be static?
sound/pci/hda/patch_si3054.c:286:25: warning: symbol 'snd_hda_preset_si3054' was not declared. Should it be static?
sound/pci/hda/patch_atihdmi.c:156:25: warning: symbol 'snd_hda_preset_atihdmi' was not declared. Should it be static?
sound/pci/hda/patch_conexant.c:1721:25: warning: symbol 'snd_hda_preset_conexant' was not declared. Should it be static?
sound/pci/hda/patch_via.c:1962:25: warning: symbol 'snd_hda_preset_via' was not declared. Should it be static?
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 8ab88d9ba3b5..e6bace83e7cf 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <sound/initval.h> | 31 | #include <sound/initval.h> |
32 | #include "hda_local.h" | 32 | #include "hda_local.h" |
33 | #include <sound/hda_hwdep.h> | 33 | #include <sound/hda_hwdep.h> |
34 | #include "hda_patch.h" /* codec presets */ | ||
34 | 35 | ||
35 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 36 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
36 | /* define this option here to hide as static */ | 37 | /* define this option here to hide as static */ |
@@ -68,9 +69,33 @@ static struct hda_vendor_id hda_vendor_ids[] = { | |||
68 | {} /* terminator */ | 69 | {} /* terminator */ |
69 | }; | 70 | }; |
70 | 71 | ||
71 | /* codec presets */ | 72 | static const struct hda_codec_preset *hda_preset_tables[] = { |
72 | #include "hda_patch.h" | 73 | #ifdef CONFIG_SND_HDA_CODEC_REALTEK |
73 | 74 | snd_hda_preset_realtek, | |
75 | #endif | ||
76 | #ifdef CONFIG_SND_HDA_CODEC_CMEDIA | ||
77 | snd_hda_preset_cmedia, | ||
78 | #endif | ||
79 | #ifdef CONFIG_SND_HDA_CODEC_ANALOG | ||
80 | snd_hda_preset_analog, | ||
81 | #endif | ||
82 | #ifdef CONFIG_SND_HDA_CODEC_SIGMATEL | ||
83 | snd_hda_preset_sigmatel, | ||
84 | #endif | ||
85 | #ifdef CONFIG_SND_HDA_CODEC_SI3054 | ||
86 | snd_hda_preset_si3054, | ||
87 | #endif | ||
88 | #ifdef CONFIG_SND_HDA_CODEC_ATIHDMI | ||
89 | snd_hda_preset_atihdmi, | ||
90 | #endif | ||
91 | #ifdef CONFIG_SND_HDA_CODEC_CONEXANT | ||
92 | snd_hda_preset_conexant, | ||
93 | #endif | ||
94 | #ifdef CONFIG_SND_HDA_CODEC_VIA | ||
95 | snd_hda_preset_via, | ||
96 | #endif | ||
97 | NULL | ||
98 | }; | ||
74 | 99 | ||
75 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 100 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
76 | static void hda_power_work(struct work_struct *work); | 101 | static void hda_power_work(struct work_struct *work); |