aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/opl3sa2.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-06-09 09:28:07 -0400
committerJaroslav Kysela <perex@suse.cz>2006-06-22 15:34:17 -0400
commit2e74eba3e2f000184ade92833c80e799af41c180 (patch)
treea83010a86190b9bf57e28352898e32acb4679e33 /sound/isa/opl3sa2.c
parent3f3488b84c261ab3cb64b9f0b9f40b61e33edb98 (diff)
[ALSA] Fix invalid __init in ALSA ISA drivers
Replaced invalid __init with __devinit in snd-sbawe and snd-opl3sa2 drivers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/opl3sa2.c')
-rw-r--r--sound/isa/opl3sa2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 931ff75e543b..647a996791e9 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -221,7 +221,7 @@ static void snd_opl3sa2_write(struct snd_opl3sa2 *chip, unsigned char reg, unsig
221 spin_unlock_irqrestore(&chip->reg_lock, flags); 221 spin_unlock_irqrestore(&chip->reg_lock, flags);
222} 222}
223 223
224static int __init snd_opl3sa2_detect(struct snd_opl3sa2 *chip) 224static int __devinit snd_opl3sa2_detect(struct snd_opl3sa2 *chip)
225{ 225{
226 struct snd_card *card; 226 struct snd_card *card;
227 unsigned long port; 227 unsigned long port;
@@ -489,7 +489,7 @@ static void snd_opl3sa2_master_free(struct snd_kcontrol *kcontrol)
489 chip->master_volume = NULL; 489 chip->master_volume = NULL;
490} 490}
491 491
492static int __init snd_opl3sa2_mixer(struct snd_opl3sa2 *chip) 492static int __devinit snd_opl3sa2_mixer(struct snd_opl3sa2 *chip)
493{ 493{
494 struct snd_card *card = chip->card; 494 struct snd_card *card = chip->card;
495 struct snd_ctl_elem_id id1, id2; 495 struct snd_ctl_elem_id id1, id2;
@@ -583,8 +583,8 @@ static int snd_opl3sa2_resume(struct snd_card *card)
583#endif /* CONFIG_PM */ 583#endif /* CONFIG_PM */
584 584
585#ifdef CONFIG_PNP 585#ifdef CONFIG_PNP
586static int __init snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip, 586static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
587 struct pnp_dev *pdev) 587 struct pnp_dev *pdev)
588{ 588{
589 struct pnp_resource_table * cfg; 589 struct pnp_resource_table * cfg;
590 int err; 590 int err;
@@ -862,7 +862,7 @@ static struct pnp_card_driver opl3sa2_pnpc_driver = {
862}; 862};
863#endif /* CONFIG_PNP */ 863#endif /* CONFIG_PNP */
864 864
865static int __init snd_opl3sa2_nonpnp_probe(struct platform_device *pdev) 865static int __devinit snd_opl3sa2_nonpnp_probe(struct platform_device *pdev)
866{ 866{
867 struct snd_card *card; 867 struct snd_card *card;
868 int err; 868 int err;