diff options
| author | Prarit Bhargava <prarit@redhat.com> | 2007-02-13 13:11:11 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-14 08:38:28 +0100 |
| commit | 788c6043335590e0a483fdc18f85b1405a157bf9 (patch) | |
| tree | 23e24335e62ba0f692da4707933c7680e94fa1d8 /sound/isa/gus/gusextreme.c | |
| parent | 46f02ca36e9b2b690ebcef18fa0652c586d6c08e (diff) | |
| download | linux-788c6043335590e0a483fdc18f85b1405a157bf9.tar.bz2 | |
[ALSA] Fix __devinit and __devexit issues with sound drivers
Fix __devinit and __devexit issues with sound drivers.
Resolves MODPOST warnings similar to:
WARNING: sound/drivers/snd-dummy.o - Section mismatch: reference to .init.text:snd_dummy_probe from .data.rel.local between 'snd_dummy_driver' (at offset 0x0) and 'snd_dummy_controls'
WARNING: sound/drivers/snd-mtpav.o - Section mismatch: reference to .init.text:snd_mtpav_probe from .data.rel.local between 'snd_mtpav_driver' (at offset 0x0) and 'snd_mtpav_input'
WARNING: sound/drivers/snd-virmidi.o - Section mismatch: reference to .init.text:snd_virmidi_probe from .data.rel.local after 'snd_virmidi_driver' (at offset 0x0)
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa/gus/gusextreme.c')
| -rw-r--r-- | sound/isa/gus/gusextreme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c index 532c56e35ca4..4f55fc3e66c1 100644 --- a/sound/isa/gus/gusextreme.c +++ b/sound/isa/gus/gusextreme.c @@ -92,7 +92,7 @@ static struct platform_device *devices[SNDRV_CARDS]; #define PFX "gusextreme: " -static int __init snd_gusextreme_detect(int dev, +static int __devinit snd_gusextreme_detect(int dev, struct snd_card *card, struct snd_gus_card * gus, struct snd_es1688 *es1688) @@ -142,12 +142,12 @@ static int __init snd_gusextreme_detect(int dev, return 0; } -static void __init snd_gusextreme_init(int dev, struct snd_gus_card * gus) +static void __devinit snd_gusextreme_init(int dev, struct snd_gus_card * gus) { gus->joystick_dac = joystick_dac[dev]; } -static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) +static int __devinit snd_gusextreme_mixer(struct snd_es1688 *chip) { struct snd_card *card = chip->card; struct snd_ctl_elem_id id1, id2; @@ -169,7 +169,7 @@ static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) return 0; } -static int __init snd_gusextreme_probe(struct platform_device *pdev) +static int __devinit snd_gusextreme_probe(struct platform_device *pdev) { int dev = pdev->id; static int possible_ess_irqs[] = {5, 9, 10, 7, -1}; @@ -321,7 +321,7 @@ static int __init snd_gusextreme_probe(struct platform_device *pdev) return err; } -static int snd_gusextreme_remove(struct platform_device *devptr) +static int __devexit snd_gusextreme_remove(struct platform_device *devptr) { snd_card_free(platform_get_drvdata(devptr)); platform_set_drvdata(devptr, NULL); @@ -332,7 +332,7 @@ static int snd_gusextreme_remove(struct platform_device *devptr) static struct platform_driver snd_gusextreme_driver = { .probe = snd_gusextreme_probe, - .remove = snd_gusextreme_remove, + .remove = __devexit_p(snd_gusextreme_remove), /* FIXME: suspend/resume */ .driver = { .name = GUSEXTREME_DRIVER |