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/gusextreme.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/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]; | |||
92 | 92 | ||
93 | #define PFX "gusextreme: " | 93 | #define PFX "gusextreme: " |
94 | 94 | ||
95 | static int __init snd_gusextreme_detect(int dev, | 95 | static int __devinit snd_gusextreme_detect(int dev, |
96 | struct snd_card *card, | 96 | struct snd_card *card, |
97 | struct snd_gus_card * gus, | 97 | struct snd_gus_card * gus, |
98 | struct snd_es1688 *es1688) | 98 | struct snd_es1688 *es1688) |
@@ -142,12 +142,12 @@ static int __init snd_gusextreme_detect(int dev, | |||
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | 144 | ||
145 | static void __init snd_gusextreme_init(int dev, struct snd_gus_card * gus) | 145 | static void __devinit snd_gusextreme_init(int dev, struct snd_gus_card * gus) |
146 | { | 146 | { |
147 | gus->joystick_dac = joystick_dac[dev]; | 147 | gus->joystick_dac = joystick_dac[dev]; |
148 | } | 148 | } |
149 | 149 | ||
150 | static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) | 150 | static int __devinit snd_gusextreme_mixer(struct snd_es1688 *chip) |
151 | { | 151 | { |
152 | struct snd_card *card = chip->card; | 152 | struct snd_card *card = chip->card; |
153 | struct snd_ctl_elem_id id1, id2; | 153 | struct snd_ctl_elem_id id1, id2; |
@@ -169,7 +169,7 @@ static int __init snd_gusextreme_mixer(struct snd_es1688 *chip) | |||
169 | return 0; | 169 | return 0; |
170 | } | 170 | } |
171 | 171 | ||
172 | static int __init snd_gusextreme_probe(struct platform_device *pdev) | 172 | static int __devinit snd_gusextreme_probe(struct platform_device *pdev) |
173 | { | 173 | { |
174 | int dev = pdev->id; | 174 | int dev = pdev->id; |
175 | static int possible_ess_irqs[] = {5, 9, 10, 7, -1}; | 175 | static int possible_ess_irqs[] = {5, 9, 10, 7, -1}; |
@@ -321,7 +321,7 @@ static int __init snd_gusextreme_probe(struct platform_device *pdev) | |||
321 | return err; | 321 | return err; |
322 | } | 322 | } |
323 | 323 | ||
324 | static int snd_gusextreme_remove(struct platform_device *devptr) | 324 | static int __devexit snd_gusextreme_remove(struct platform_device *devptr) |
325 | { | 325 | { |
326 | snd_card_free(platform_get_drvdata(devptr)); | 326 | snd_card_free(platform_get_drvdata(devptr)); |
327 | platform_set_drvdata(devptr, NULL); | 327 | platform_set_drvdata(devptr, NULL); |
@@ -332,7 +332,7 @@ static int snd_gusextreme_remove(struct platform_device *devptr) | |||
332 | 332 | ||
333 | static struct platform_driver snd_gusextreme_driver = { | 333 | static struct platform_driver snd_gusextreme_driver = { |
334 | .probe = snd_gusextreme_probe, | 334 | .probe = snd_gusextreme_probe, |
335 | .remove = snd_gusextreme_remove, | 335 | .remove = __devexit_p(snd_gusextreme_remove), |
336 | /* FIXME: suspend/resume */ | 336 | /* FIXME: suspend/resume */ |
337 | .driver = { | 337 | .driver = { |
338 | .name = GUSEXTREME_DRIVER | 338 | .name = GUSEXTREME_DRIVER |