diff options
Diffstat (limited to 'sound/isa/gus/gusmax.c')
-rw-r--r-- | sound/isa/gus/gusmax.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index c1c69e3cbfd0..d1ad90ca035d 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c | |||
@@ -85,7 +85,7 @@ struct snd_gusmax { | |||
85 | 85 | ||
86 | #define PFX "gusmax: " | 86 | #define PFX "gusmax: " |
87 | 87 | ||
88 | static int __init snd_gusmax_detect(struct snd_gus_card * gus) | 88 | static int __devinit snd_gusmax_detect(struct snd_gus_card * gus) |
89 | { | 89 | { |
90 | unsigned char d; | 90 | unsigned char d; |
91 | 91 | ||
@@ -127,7 +127,8 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id) | |||
127 | return IRQ_RETVAL(handled); | 127 | return IRQ_RETVAL(handled); |
128 | } | 128 | } |
129 | 129 | ||
130 | static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gus_card * gus) | 130 | static void __devinit snd_gusmax_init(int dev, struct snd_card *card, |
131 | struct snd_gus_card * gus) | ||
131 | { | 132 | { |
132 | gus->equal_irq = 1; | 133 | gus->equal_irq = 1; |
133 | gus->codec_flag = 1; | 134 | gus->codec_flag = 1; |
@@ -145,7 +146,7 @@ static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gu | |||
145 | #define CS4231_PRIVATE( left, right, shift, mute ) \ | 146 | #define CS4231_PRIVATE( left, right, shift, mute ) \ |
146 | ((left << 24)|(right << 16)|(shift<<8)|mute) | 147 | ((left << 24)|(right << 16)|(shift<<8)|mute) |
147 | 148 | ||
148 | static int __init snd_gusmax_mixer(struct snd_cs4231 *chip) | 149 | static int __devinit snd_gusmax_mixer(struct snd_cs4231 *chip) |
149 | { | 150 | { |
150 | struct snd_card *card = chip->card; | 151 | struct snd_card *card = chip->card; |
151 | struct snd_ctl_elem_id id1, id2; | 152 | struct snd_ctl_elem_id id1, id2; |
@@ -204,7 +205,7 @@ static void snd_gusmax_free(struct snd_card *card) | |||
204 | free_irq(maxcard->irq, (void *)maxcard); | 205 | free_irq(maxcard->irq, (void *)maxcard); |
205 | } | 206 | } |
206 | 207 | ||
207 | static int __init snd_gusmax_probe(struct platform_device *pdev) | 208 | static int __devinit snd_gusmax_probe(struct platform_device *pdev) |
208 | { | 209 | { |
209 | int dev = pdev->id; | 210 | int dev = pdev->id; |
210 | static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; | 211 | static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; |
@@ -348,7 +349,7 @@ static int __init snd_gusmax_probe(struct platform_device *pdev) | |||
348 | return err; | 349 | return err; |
349 | } | 350 | } |
350 | 351 | ||
351 | static int snd_gusmax_remove(struct platform_device *devptr) | 352 | static int __devexit snd_gusmax_remove(struct platform_device *devptr) |
352 | { | 353 | { |
353 | snd_card_free(platform_get_drvdata(devptr)); | 354 | snd_card_free(platform_get_drvdata(devptr)); |
354 | platform_set_drvdata(devptr, NULL); | 355 | platform_set_drvdata(devptr, NULL); |
@@ -359,7 +360,7 @@ static int snd_gusmax_remove(struct platform_device *devptr) | |||
359 | 360 | ||
360 | static struct platform_driver snd_gusmax_driver = { | 361 | static struct platform_driver snd_gusmax_driver = { |
361 | .probe = snd_gusmax_probe, | 362 | .probe = snd_gusmax_probe, |
362 | .remove = snd_gusmax_remove, | 363 | .remove = __devexit_p(snd_gusmax_remove), |
363 | /* FIXME: suspend/resume */ | 364 | /* FIXME: suspend/resume */ |
364 | .driver = { | 365 | .driver = { |
365 | .name = GUSMAX_DRIVER | 366 | .name = GUSMAX_DRIVER |