diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-07-05 10:51:05 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-07-12 14:08:01 -0400 |
commit | f40b68903ccd511ea9d658b4bce319dd032a265a (patch) | |
tree | 9f8447f4370f5e4d9303ca5c8e0b2c8cd790c67e /sound/pci/emu10k1/emu10k1_main.c | |
parent | 562b590d4e838ecaca2cfd246fd4df55dc6db18a (diff) |
[ALSA] Fix section mismatch errors in ALSA PCI drivers
Fixed 'section mismatch' errors in ALSA PCI drivers:
- removed invalid __devinitdata from pci id tables
- fix/remove __devinit of functions called in suspend/resume
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/emu10k1/emu10k1_main.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index d6f135fe2958..f9b5c3dc3b34 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -531,7 +531,7 @@ static void snd_emu10k1_ecard_setadcgain(struct snd_emu10k1 * emu, | |||
531 | snd_emu10k1_ecard_write(emu, emu->ecard_ctrl); | 531 | snd_emu10k1_ecard_write(emu, emu->ecard_ctrl); |
532 | } | 532 | } |
533 | 533 | ||
534 | static int __devinit snd_emu10k1_ecard_init(struct snd_emu10k1 * emu) | 534 | static int snd_emu10k1_ecard_init(struct snd_emu10k1 * emu) |
535 | { | 535 | { |
536 | unsigned int hc_value; | 536 | unsigned int hc_value; |
537 | 537 | ||
@@ -571,7 +571,7 @@ static int __devinit snd_emu10k1_ecard_init(struct snd_emu10k1 * emu) | |||
571 | return 0; | 571 | return 0; |
572 | } | 572 | } |
573 | 573 | ||
574 | static int __devinit snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu) | 574 | static int snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu) |
575 | { | 575 | { |
576 | unsigned long special_port; | 576 | unsigned long special_port; |
577 | unsigned int value; | 577 | unsigned int value; |
@@ -633,7 +633,7 @@ static int snd_emu1212m_fpga_netlist_write(struct snd_emu10k1 * emu, int reg, in | |||
633 | return 0; | 633 | return 0; |
634 | } | 634 | } |
635 | 635 | ||
636 | static int __devinit snd_emu10k1_emu1212m_init(struct snd_emu10k1 * emu) | 636 | static int snd_emu10k1_emu1212m_init(struct snd_emu10k1 * emu) |
637 | { | 637 | { |
638 | unsigned int i; | 638 | unsigned int i; |
639 | int tmp; | 639 | int tmp; |
@@ -1430,6 +1430,10 @@ void snd_emu10k1_resume_init(struct snd_emu10k1 *emu) | |||
1430 | { | 1430 | { |
1431 | if (emu->card_capabilities->ecard) | 1431 | if (emu->card_capabilities->ecard) |
1432 | snd_emu10k1_ecard_init(emu); | 1432 | snd_emu10k1_ecard_init(emu); |
1433 | else if (emu->card_capabilities->ca_cardbus_chip) | ||
1434 | snd_emu10k1_cardbus_init(emu); | ||
1435 | else if (emu->card_capabilities->emu1212m) | ||
1436 | snd_emu10k1_emu1212m_init(emu); | ||
1433 | else | 1437 | else |
1434 | snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE); | 1438 | snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE); |
1435 | snd_emu10k1_init(emu, emu->enable_ir, 1); | 1439 | snd_emu10k1_init(emu, emu->enable_ir, 1); |