diff options
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 a9ff391258e7..40eb026c86ed 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) | |||
583 | /* | 583 | /* |
584 | * get ISA resources | 584 | * get ISA resources |
585 | */ | 585 | */ |
586 | static int __init snd_mtpav_get_ISA(struct mtpav * mcard) | 586 | static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard) |
587 | { | 587 | { |
588 | if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) { | 588 | if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) { |
589 | snd_printk("MTVAP port 0x%lx is busy\n", port); | 589 | snd_printk("MTVAP port 0x%lx is busy\n", port); |
@@ -619,7 +619,7 @@ static struct snd_rawmidi_ops snd_mtpav_input = { | |||
619 | * get RAWMIDI resources | 619 | * get RAWMIDI resources |
620 | */ | 620 | */ |
621 | 621 | ||
622 | static void __init snd_mtpav_set_name(struct mtpav *chip, | 622 | static void __devinit snd_mtpav_set_name(struct mtpav *chip, |
623 | struct snd_rawmidi_substream *substream) | 623 | struct snd_rawmidi_substream *substream) |
624 | { | 624 | { |
625 | if (substream->number >= 0 && substream->number < chip->num_ports) | 625 | if (substream->number >= 0 && substream->number < chip->num_ports) |
@@ -634,7 +634,7 @@ static void __init snd_mtpav_set_name(struct mtpav *chip, | |||
634 | strcpy(substream->name, "MTP broadcast"); | 634 | strcpy(substream->name, "MTP broadcast"); |
635 | } | 635 | } |
636 | 636 | ||
637 | static int __init snd_mtpav_get_RAWMIDI(struct mtpav *mcard) | 637 | static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard) |
638 | { | 638 | { |
639 | int rval; | 639 | int rval; |
640 | struct snd_rawmidi *rawmidi; | 640 | struct snd_rawmidi *rawmidi; |
@@ -691,7 +691,7 @@ static void snd_mtpav_free(struct snd_card *card) | |||
691 | 691 | ||
692 | /* | 692 | /* |
693 | */ | 693 | */ |
694 | static int __init snd_mtpav_probe(struct platform_device *dev) | 694 | static int __devinit snd_mtpav_probe(struct platform_device *dev) |
695 | { | 695 | { |
696 | struct snd_card *card; | 696 | struct snd_card *card; |
697 | int err; | 697 | int err; |
@@ -745,7 +745,7 @@ static int __init snd_mtpav_probe(struct platform_device *dev) | |||
745 | return err; | 745 | return err; |
746 | } | 746 | } |
747 | 747 | ||
748 | static int snd_mtpav_remove(struct platform_device *devptr) | 748 | static int __devexit snd_mtpav_remove(struct platform_device *devptr) |
749 | { | 749 | { |
750 | snd_card_free(platform_get_drvdata(devptr)); | 750 | snd_card_free(platform_get_drvdata(devptr)); |
751 | platform_set_drvdata(devptr, NULL); | 751 | platform_set_drvdata(devptr, NULL); |
@@ -756,7 +756,7 @@ static int snd_mtpav_remove(struct platform_device *devptr) | |||
756 | 756 | ||
757 | static struct platform_driver snd_mtpav_driver = { | 757 | static struct platform_driver snd_mtpav_driver = { |
758 | .probe = snd_mtpav_probe, | 758 | .probe = snd_mtpav_probe, |
759 | .remove = snd_mtpav_remove, | 759 | .remove = __devexit_p(snd_mtpav_remove), |
760 | .driver = { | 760 | .driver = { |
761 | .name = SND_MTPAV_DRIVER | 761 | .name = SND_MTPAV_DRIVER |
762 | }, | 762 | }, |