diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:41:56 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-07 01:41:56 -0500 |
commit | 6a0f56a784cd8b08d5c438c11cfa659472b29113 (patch) | |
tree | 76f2f4a393fc9f4b4804d451daf9f0988e7a4ac9 | |
parent | 48c8b0eb6d8265e639a800a9b62d704812e191d8 (diff) |
ALSA: Remove the rest of __devinit* in comments
Remove the leftover __devinit* in comments.
They have been commented out because they couldn't fit with __dev*
although they should have matched.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/isa/sb/emu8000.c | 8 | ||||
-rw-r--r-- | sound/pci/hda/hda_codec.c | 10 | ||||
-rw-r--r-- | sound/pci/hda/hda_hwdep.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index 1d8a0364b9f5..45fcdff611f9 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c | |||
@@ -235,7 +235,7 @@ init_dma(struct snd_emu8000 *emu) | |||
235 | /* | 235 | /* |
236 | * initialization arrays; from ADIP | 236 | * initialization arrays; from ADIP |
237 | */ | 237 | */ |
238 | static unsigned short init1[128] /*__devinitdata*/ = { | 238 | static unsigned short init1[128] = { |
239 | 0x03ff, 0x0030, 0x07ff, 0x0130, 0x0bff, 0x0230, 0x0fff, 0x0330, | 239 | 0x03ff, 0x0030, 0x07ff, 0x0130, 0x0bff, 0x0230, 0x0fff, 0x0330, |
240 | 0x13ff, 0x0430, 0x17ff, 0x0530, 0x1bff, 0x0630, 0x1fff, 0x0730, | 240 | 0x13ff, 0x0430, 0x17ff, 0x0530, 0x1bff, 0x0630, 0x1fff, 0x0730, |
241 | 0x23ff, 0x0830, 0x27ff, 0x0930, 0x2bff, 0x0a30, 0x2fff, 0x0b30, | 241 | 0x23ff, 0x0830, 0x27ff, 0x0930, 0x2bff, 0x0a30, 0x2fff, 0x0b30, |
@@ -257,7 +257,7 @@ static unsigned short init1[128] /*__devinitdata*/ = { | |||
257 | 0xf3ff, 0x0c30, 0xf7ff, 0x0d30, 0xfbff, 0x0e30, 0xffff, 0x0f30, | 257 | 0xf3ff, 0x0c30, 0xf7ff, 0x0d30, 0xfbff, 0x0e30, 0xffff, 0x0f30, |
258 | }; | 258 | }; |
259 | 259 | ||
260 | static unsigned short init2[128] /*__devinitdata*/ = { | 260 | static unsigned short init2[128] = { |
261 | 0x03ff, 0x8030, 0x07ff, 0x8130, 0x0bff, 0x8230, 0x0fff, 0x8330, | 261 | 0x03ff, 0x8030, 0x07ff, 0x8130, 0x0bff, 0x8230, 0x0fff, 0x8330, |
262 | 0x13ff, 0x8430, 0x17ff, 0x8530, 0x1bff, 0x8630, 0x1fff, 0x8730, | 262 | 0x13ff, 0x8430, 0x17ff, 0x8530, 0x1bff, 0x8630, 0x1fff, 0x8730, |
263 | 0x23ff, 0x8830, 0x27ff, 0x8930, 0x2bff, 0x8a30, 0x2fff, 0x8b30, | 263 | 0x23ff, 0x8830, 0x27ff, 0x8930, 0x2bff, 0x8a30, 0x2fff, 0x8b30, |
@@ -279,7 +279,7 @@ static unsigned short init2[128] /*__devinitdata*/ = { | |||
279 | 0xf3ff, 0x8c30, 0xf7ff, 0x8d30, 0xfbff, 0x8e30, 0xffff, 0x8f30, | 279 | 0xf3ff, 0x8c30, 0xf7ff, 0x8d30, 0xfbff, 0x8e30, 0xffff, 0x8f30, |
280 | }; | 280 | }; |
281 | 281 | ||
282 | static unsigned short init3[128] /*__devinitdata*/ = { | 282 | static unsigned short init3[128] = { |
283 | 0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5, | 283 | 0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5, |
284 | 0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x8F7C, 0x167E, 0xF254, | 284 | 0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x8F7C, 0x167E, 0xF254, |
285 | 0x0000, 0x842A, 0x0001, 0x852A, 0x18E6, 0x8BAA, 0x1B6D, 0xF234, | 285 | 0x0000, 0x842A, 0x0001, 0x852A, 0x18E6, 0x8BAA, 0x1B6D, 0xF234, |
@@ -301,7 +301,7 @@ static unsigned short init3[128] /*__devinitdata*/ = { | |||
301 | 0x1342, 0xD36E, 0x3EC7, 0xB3FF, 0x0000, 0x8365, 0x1420, 0x9570, | 301 | 0x1342, 0xD36E, 0x3EC7, 0xB3FF, 0x0000, 0x8365, 0x1420, 0x9570, |
302 | }; | 302 | }; |
303 | 303 | ||
304 | static unsigned short init4[128] /*__devinitdata*/ = { | 304 | static unsigned short init4[128] = { |
305 | 0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5, | 305 | 0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5, |
306 | 0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x0F7C, 0x167E, 0x7254, | 306 | 0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x0F7C, 0x167E, 0x7254, |
307 | 0x0000, 0x842A, 0x0001, 0x852A, 0x18E6, 0x0BAA, 0x1B6D, 0x7234, | 307 | 0x0000, 0x842A, 0x0001, 0x852A, 0x18E6, 0x0BAA, 0x1B6D, 0x7234, |
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 | */ |
741 | int /*__devinit*/ snd_hda_bus_new(struct snd_card *card, | 741 | int 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 | */ |
911 | static void /*__devinit*/ setup_fg_nodes(struct hda_codec *codec) | 911 | static 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 | */ |
1215 | int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, | 1215 | int 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 */ |
1570 | static void /*__devinit*/ init_hda_cache(struct hda_cache_rec *cache, | 1570 | static 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 | */ |
3687 | int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus) | 3687 | int 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 | ||
128 | int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec) | 128 | int 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; |