diff options
author | Prarit Bhargava <prarit@redhat.com> | 2007-02-13 07:11:11 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-14 02:38:28 -0500 |
commit | 788c6043335590e0a483fdc18f85b1405a157bf9 (patch) | |
tree | 23e24335e62ba0f692da4707933c7680e94fa1d8 /sound/isa/gus/gusclassic.c | |
parent | 46f02ca36e9b2b690ebcef18fa0652c586d6c08e (diff) |
[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/gusclassic.c')
-rw-r--r-- | sound/isa/gus/gusclassic.c | 10 |
1 files changed, 5 insertions, 5 deletions
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]; | |||
76 | 76 | ||
77 | #define PFX "gusclassic: " | 77 | #define PFX "gusclassic: " |
78 | 78 | ||
79 | static int __init snd_gusclassic_detect(struct snd_gus_card * gus) | 79 | static int __devinit snd_gusclassic_detect(struct snd_gus_card * gus) |
80 | { | 80 | { |
81 | unsigned char d; | 81 | unsigned char d; |
82 | 82 | ||
@@ -95,7 +95,7 @@ static int __init snd_gusclassic_detect(struct snd_gus_card * gus) | |||
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |
97 | 97 | ||
98 | static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus) | 98 | static void __devinit snd_gusclassic_init(int dev, struct snd_gus_card * gus) |
99 | { | 99 | { |
100 | gus->equal_irq = 0; | 100 | gus->equal_irq = 0; |
101 | gus->codec_flag = 0; | 101 | gus->codec_flag = 0; |
@@ -103,7 +103,7 @@ static void __init snd_gusclassic_init(int dev, struct snd_gus_card * gus) | |||
103 | gus->joystick_dac = joystick_dac[dev]; | 103 | gus->joystick_dac = joystick_dac[dev]; |
104 | } | 104 | } |
105 | 105 | ||
106 | static int __init snd_gusclassic_probe(struct platform_device *pdev) | 106 | static int __devinit snd_gusclassic_probe(struct platform_device *pdev) |
107 | { | 107 | { |
108 | int dev = pdev->id; | 108 | int dev = pdev->id; |
109 | static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1}; | 109 | 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) | |||
211 | return err; | 211 | return err; |
212 | } | 212 | } |
213 | 213 | ||
214 | static int snd_gusclassic_remove(struct platform_device *devptr) | 214 | static int __devexit snd_gusclassic_remove(struct platform_device *devptr) |
215 | { | 215 | { |
216 | snd_card_free(platform_get_drvdata(devptr)); | 216 | snd_card_free(platform_get_drvdata(devptr)); |
217 | platform_set_drvdata(devptr, NULL); | 217 | platform_set_drvdata(devptr, NULL); |
@@ -222,7 +222,7 @@ static int snd_gusclassic_remove(struct platform_device *devptr) | |||
222 | 222 | ||
223 | static struct platform_driver snd_gusclassic_driver = { | 223 | static struct platform_driver snd_gusclassic_driver = { |
224 | .probe = snd_gusclassic_probe, | 224 | .probe = snd_gusclassic_probe, |
225 | .remove = snd_gusclassic_remove, | 225 | .remove = __devexit_p(snd_gusclassic_remove), |
226 | /* FIXME: suspend/resume */ | 226 | /* FIXME: suspend/resume */ |
227 | .driver = { | 227 | .driver = { |
228 | .name = GUSCLASSIC_DRIVER | 228 | .name = GUSCLASSIC_DRIVER |