From 788c6043335590e0a483fdc18f85b1405a157bf9 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Tue, 13 Feb 2007 13:11:11 +0100 Subject: [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 Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/isa/gus/gusclassic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sound/isa/gus/gusclassic.c') diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c index 37057a37dc30..0395e2e0dd03 100644 --- a/sound/isa/gus/gusclassic.c +++ b/sound/isa/gus/gusclassic.c @@ -76,7 +76,7 @@ static struct platform_device *devices[SNDRV_CARDS]; #define PFX "gusclassic: " -static int __init snd_gusclassic_detect(struct snd_gus_card * gus) +static int __devinit snd_gusclassic_detect(struct snd_gus_card * gus) { unsigned char d; @@ -95,7 +95,7 @@ static int __init snd_gusclassic_detect(struct snd_gus_card * gus) return 0; } -static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus) +static void __devinit snd_gusclassic_init(int dev, struct snd_gus_card * gus) { gus->equal_irq = 0; gus->codec_flag = 0; @@ -103,7 +103,7 @@ static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus) gus->joystick_dac = joystick_dac[dev]; } -static int __init snd_gusclassic_probe(struct platform_device *pdev) +static int __devinit snd_gusclassic_probe(struct platform_device *pdev) { int dev = pdev->id; static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1}; @@ -211,7 +211,7 @@ static int __init snd_gusclassic_probe(struct platform_device *pdev) return err; } -static int snd_gusclassic_remove(struct platform_device *devptr) +static int __devexit snd_gusclassic_remove(struct platform_device *devptr) { snd_card_free(platform_get_drvdata(devptr)); platform_set_drvdata(devptr, NULL); @@ -222,7 +222,7 @@ static int snd_gusclassic_remove(struct platform_device *devptr) static struct platform_driver snd_gusclassic_driver = { .probe = snd_gusclassic_probe, - .remove = snd_gusclassic_remove, + .remove = __devexit_p(snd_gusclassic_remove), /* FIXME: suspend/resume */ .driver = { .name = GUSCLASSIC_DRIVER -- cgit v1.2.3