aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_codec.c10
-rw-r--r--sound/pci/hda/hda_hwdep.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index c5d0472aaba4..8353c77536ac 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -738,7 +738,7 @@ static int snd_hda_bus_dev_register(struct snd_device *device)
738 * 738 *
739 * Returns 0 if successful, or a negative error code. 739 * Returns 0 if successful, or a negative error code.
740 */ 740 */
741int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, 741int snd_hda_bus_new(struct snd_card *card,
742 const struct hda_bus_template *temp, 742 const struct hda_bus_template *temp,
743 struct hda_bus **busp) 743 struct hda_bus **busp)
744{ 744{
@@ -908,7 +908,7 @@ static int get_codec_name(struct hda_codec *codec)
908/* 908/*
909 * look for an AFG and MFG nodes 909 * look for an AFG and MFG nodes
910 */ 910 */
911static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec) 911static void setup_fg_nodes(struct hda_codec *codec)
912{ 912{
913 int i, total_nodes, function_id; 913 int i, total_nodes, function_id;
914 hda_nid_t nid; 914 hda_nid_t nid;
@@ -1212,7 +1212,7 @@ static unsigned int hda_set_power_state(struct hda_codec *codec,
1212 * 1212 *
1213 * Returns 0 if successful, or a negative error code. 1213 * Returns 0 if successful, or a negative error code.
1214 */ 1214 */
1215int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, 1215int snd_hda_codec_new(struct hda_bus *bus,
1216 unsigned int codec_addr, 1216 unsigned int codec_addr,
1217 struct hda_codec **codecp) 1217 struct hda_codec **codecp)
1218{ 1218{
@@ -1567,7 +1567,7 @@ static void hda_cleanup_all_streams(struct hda_codec *codec)
1567#define INFO_AMP_VOL(ch) (1 << (1 + (ch))) 1567#define INFO_AMP_VOL(ch) (1 << (1 + (ch)))
1568 1568
1569/* initialize the hash table */ 1569/* initialize the hash table */
1570static void /*__devinit*/ init_hda_cache(struct hda_cache_rec *cache, 1570static void init_hda_cache(struct hda_cache_rec *cache,
1571 unsigned int record_size) 1571 unsigned int record_size)
1572{ 1572{
1573 memset(cache, 0, sizeof(*cache)); 1573 memset(cache, 0, sizeof(*cache));
@@ -3684,7 +3684,7 @@ static void hda_call_codec_resume(struct hda_codec *codec)
3684 * 3684 *
3685 * Returns 0 if successful, otherwise a negative error code. 3685 * Returns 0 if successful, otherwise a negative error code.
3686 */ 3686 */
3687int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus) 3687int snd_hda_build_controls(struct hda_bus *bus)
3688{ 3688{
3689 struct hda_codec *codec; 3689 struct hda_codec *codec;
3690 3690
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 1af86d40eb23..a5c9411bb367 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -125,7 +125,7 @@ static void hwdep_free(struct snd_hwdep *hwdep)
125 clear_hwdep_elements(hwdep->private_data); 125 clear_hwdep_elements(hwdep->private_data);
126} 126}
127 127
128int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec) 128int snd_hda_create_hwdep(struct hda_codec *codec)
129{ 129{
130 char hwname[16]; 130 char hwname[16];
131 struct snd_hwdep *hwdep; 131 struct snd_hwdep *hwdep;