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/drivers/mtpav.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/drivers/mtpav.c')
| -rw-r--r-- | sound/drivers/mtpav.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index a9ff391258e..40eb026c86e 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c @@ -583,7 +583,7 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id) /* * get ISA resources */ -static int __init snd_mtpav_get_ISA(struct mtpav * mcard) +static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard) { if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) { snd_printk("MTVAP port 0x%lx is busy\n", port); @@ -619,7 +619,7 @@ static struct snd_rawmidi_ops snd_mtpav_input = { * get RAWMIDI resources */ -static void __init snd_mtpav_set_name(struct mtpav *chip, +static void __devinit snd_mtpav_set_name(struct mtpav *chip, struct snd_rawmidi_substream *substream) { if (substream->number >= 0 && substream->number < chip->num_ports) @@ -634,7 +634,7 @@ static void __init snd_mtpav_set_name(struct mtpav *chip, strcpy(substream->name, "MTP broadcast"); } -static int __init snd_mtpav_get_RAWMIDI(struct mtpav *mcard) +static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard) { int rval; struct snd_rawmidi *rawmidi; @@ -691,7 +691,7 @@ static void snd_mtpav_free(struct snd_card *card) /* */ -static int __init snd_mtpav_probe(struct platform_device *dev) +static int __devinit snd_mtpav_probe(struct platform_device *dev) { struct snd_card *card; int err; @@ -745,7 +745,7 @@ static int __init snd_mtpav_probe(struct platform_device *dev) return err; } -static int snd_mtpav_remove(struct platform_device *devptr) +static int __devexit snd_mtpav_remove(struct platform_device *devptr) { snd_card_free(platform_get_drvdata(devptr)); platform_set_drvdata(devptr, NULL); @@ -756,7 +756,7 @@ static int snd_mtpav_remove(struct platform_device *devptr) static struct platform_driver snd_mtpav_driver = { .probe = snd_mtpav_probe, - .remove = snd_mtpav_remove, + .remove = __devexit_p(snd_mtpav_remove), .driver = { .name = SND_MTPAV_DRIVER }, |