diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 09:51:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 09:51:20 -0800 |
| commit | 724339d76d9407cd1a8ad32a9c1fdf64840cc51b (patch) | |
| tree | 21461971804ffaa22cf4defdba965474da705463 /sound/isa/gus/gusmax.c | |
| parent | 414f827c46973ba39320cfb43feb55a0eeb9b4e8 (diff) | |
| parent | ccf2c2229d4473cc1a334200c1b60ab6070adabe (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] version 1.0.14rc2
[ALSA] Fix a typo in __dev* changes in portman2x4.c
[ALSA] Change AT91 PDC register defines for 2.6.20 kernel
[ALSA] SoC codecs - fix Kconfig - depends -> depends on
[ALSA] Fix __devinit and __devexit issues with sound drivers
[ALSA] hda-codec - Patch for enabling LFE on more Dell laptops
[ALSA] hda-codec - More fixes for Conexant HD Audio support
[ALSA] usb-audio: add PCR-A PCM support
[ALSA] emu10k1: fix typo
[ALSA] usbaudio - remove urb->bandwidth reference
[ALSA] ac97 - Fix silent output problem with Cx20551 codec
[ALSA] hda-codec - Fix Oops with probing sigmatel codec chips
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 c1c69e3cbfd..d1ad90ca035 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c @@ -85,7 +85,7 @@ struct snd_gusmax { #define PFX "gusmax: " -static int __init snd_gusmax_detect(struct snd_gus_card * gus) +static int __devinit snd_gusmax_detect(struct snd_gus_card * gus) { unsigned char d; @@ -127,7 +127,8 @@ static irqreturn_t snd_gusmax_interrupt(int irq, void *dev_id) return IRQ_RETVAL(handled); } -static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gus_card * gus) +static void __devinit snd_gusmax_init(int dev, struct snd_card *card, + struct snd_gus_card * gus) { gus->equal_irq = 1; gus->codec_flag = 1; @@ -145,7 +146,7 @@ static void __init snd_gusmax_init(int dev, struct snd_card *card, struct snd_gu #define CS4231_PRIVATE( left, right, shift, mute ) \ ((left << 24)|(right << 16)|(shift<<8)|mute) -static int __init snd_gusmax_mixer(struct snd_cs4231 *chip) +static int __devinit snd_gusmax_mixer(struct snd_cs4231 *chip) { struct snd_card *card = chip->card; struct snd_ctl_elem_id id1, id2; @@ -204,7 +205,7 @@ static void snd_gusmax_free(struct snd_card *card) free_irq(maxcard->irq, (void *)maxcard); } -static int __init snd_gusmax_probe(struct platform_device *pdev) +static int __devinit snd_gusmax_probe(struct platform_device *pdev) { int dev = pdev->id; 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) return err; } -static int snd_gusmax_remove(struct platform_device *devptr) +static int __devexit snd_gusmax_remove(struct platform_device *devptr) { snd_card_free(platform_get_drvdata(devptr)); platform_set_drvdata(devptr, NULL); @@ -359,7 +360,7 @@ static int snd_gusmax_remove(struct platform_device *devptr) static struct platform_driver snd_gusmax_driver = { .probe = snd_gusmax_probe, - .remove = snd_gusmax_remove, + .remove = __devexit_p(snd_gusmax_remove), /* FIXME: suspend/resume */ .driver = { .name = GUSMAX_DRIVER |