diff options
Diffstat (limited to 'sound/drivers')
| -rw-r--r-- | sound/drivers/dummy.c | 11 | ||||
| -rw-r--r-- | sound/drivers/mtpav.c | 12 | ||||
| -rw-r--r-- | sound/drivers/mts64.c | 6 | ||||
| -rw-r--r-- | sound/drivers/portman2x4.c | 6 | ||||
| -rw-r--r-- | sound/drivers/serial-u16550.c | 14 | ||||
| -rw-r--r-- | sound/drivers/virmidi.c | 6 |
6 files changed, 28 insertions, 27 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index 8339bad969ba..a0f28f51fc7e 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c | |||
| @@ -423,7 +423,8 @@ static struct snd_pcm_ops snd_card_dummy_capture_ops = { | |||
| 423 | .pointer = snd_card_dummy_pcm_pointer, | 423 | .pointer = snd_card_dummy_pcm_pointer, |
| 424 | }; | 424 | }; |
| 425 | 425 | ||
| 426 | static int __init snd_card_dummy_pcm(struct snd_dummy *dummy, int device, int substreams) | 426 | static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device, |
| 427 | int substreams) | ||
| 427 | { | 428 | { |
| 428 | struct snd_pcm *pcm; | 429 | struct snd_pcm *pcm; |
| 429 | int err; | 430 | int err; |
| @@ -562,7 +563,7 @@ DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD), | |||
| 562 | DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD) | 563 | DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD) |
| 563 | }; | 564 | }; |
| 564 | 565 | ||
| 565 | static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy) | 566 | static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy) |
| 566 | { | 567 | { |
| 567 | struct snd_card *card = dummy->card; | 568 | struct snd_card *card = dummy->card; |
| 568 | unsigned int idx; | 569 | unsigned int idx; |
| @@ -579,7 +580,7 @@ static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy) | |||
| 579 | return 0; | 580 | return 0; |
| 580 | } | 581 | } |
| 581 | 582 | ||
| 582 | static int __init snd_dummy_probe(struct platform_device *devptr) | 583 | static int __devinit snd_dummy_probe(struct platform_device *devptr) |
| 583 | { | 584 | { |
| 584 | struct snd_card *card; | 585 | struct snd_card *card; |
| 585 | struct snd_dummy *dummy; | 586 | struct snd_dummy *dummy; |
| @@ -617,7 +618,7 @@ static int __init snd_dummy_probe(struct platform_device *devptr) | |||
| 617 | return err; | 618 | return err; |
| 618 | } | 619 | } |
| 619 | 620 | ||
| 620 | static int snd_dummy_remove(struct platform_device *devptr) | 621 | static int __devexit snd_dummy_remove(struct platform_device *devptr) |
| 621 | { | 622 | { |
| 622 | snd_card_free(platform_get_drvdata(devptr)); | 623 | snd_card_free(platform_get_drvdata(devptr)); |
| 623 | platform_set_drvdata(devptr, NULL); | 624 | platform_set_drvdata(devptr, NULL); |
| @@ -648,7 +649,7 @@ static int snd_dummy_resume(struct platform_device *pdev) | |||
| 648 | 649 | ||
| 649 | static struct platform_driver snd_dummy_driver = { | 650 | static struct platform_driver snd_dummy_driver = { |
| 650 | .probe = snd_dummy_probe, | 651 | .probe = snd_dummy_probe, |
| 651 | .remove = snd_dummy_remove, | 652 | .remove = __devexit_p(snd_dummy_remove), |
| 652 | #ifdef CONFIG_PM | 653 | #ifdef CONFIG_PM |
| 653 | .suspend = snd_dummy_suspend, | 654 | .suspend = snd_dummy_suspend, |
| 654 | .resume = snd_dummy_resume, | 655 | .resume = snd_dummy_resume, |
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 | }, |
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index 5327c6f841f4..6c9f4c9bfeb6 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c | |||
| @@ -1026,7 +1026,7 @@ __err: | |||
| 1026 | return err; | 1026 | return err; |
| 1027 | } | 1027 | } |
| 1028 | 1028 | ||
| 1029 | static int snd_mts64_remove(struct platform_device *pdev) | 1029 | static int __devexit snd_mts64_remove(struct platform_device *pdev) |
| 1030 | { | 1030 | { |
| 1031 | struct snd_card *card = platform_get_drvdata(pdev); | 1031 | struct snd_card *card = platform_get_drvdata(pdev); |
| 1032 | 1032 | ||
| @@ -1039,7 +1039,7 @@ static int snd_mts64_remove(struct platform_device *pdev) | |||
| 1039 | 1039 | ||
| 1040 | static struct platform_driver snd_mts64_driver = { | 1040 | static struct platform_driver snd_mts64_driver = { |
| 1041 | .probe = snd_mts64_probe, | 1041 | .probe = snd_mts64_probe, |
| 1042 | .remove = snd_mts64_remove, | 1042 | .remove = __devexit_p(snd_mts64_remove), |
| 1043 | .driver = { | 1043 | .driver = { |
| 1044 | .name = PLATFORM_DRIVER | 1044 | .name = PLATFORM_DRIVER |
| 1045 | } | 1045 | } |
| @@ -1048,7 +1048,7 @@ static struct platform_driver snd_mts64_driver = { | |||
| 1048 | /********************************************************************* | 1048 | /********************************************************************* |
| 1049 | * module init stuff | 1049 | * module init stuff |
| 1050 | *********************************************************************/ | 1050 | *********************************************************************/ |
| 1051 | static void snd_mts64_unregister_all(void) | 1051 | static void __init_or_module snd_mts64_unregister_all(void) |
| 1052 | { | 1052 | { |
| 1053 | int i; | 1053 | int i; |
| 1054 | 1054 | ||
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 6c48772aaefd..b43d4c96ed19 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c | |||
| @@ -811,7 +811,7 @@ __err: | |||
| 811 | return err; | 811 | return err; |
| 812 | } | 812 | } |
| 813 | 813 | ||
| 814 | static int snd_portman_remove(struct platform_device *pdev) | 814 | static int __devexit snd_portman_remove(struct platform_device *pdev) |
| 815 | { | 815 | { |
| 816 | struct snd_card *card = platform_get_drvdata(pdev); | 816 | struct snd_card *card = platform_get_drvdata(pdev); |
| 817 | 817 | ||
| @@ -824,7 +824,7 @@ static int snd_portman_remove(struct platform_device *pdev) | |||
| 824 | 824 | ||
| 825 | static struct platform_driver snd_portman_driver = { | 825 | static struct platform_driver snd_portman_driver = { |
| 826 | .probe = snd_portman_probe, | 826 | .probe = snd_portman_probe, |
| 827 | .remove = snd_portman_remove, | 827 | .remove = __dev_exit_p(snd_portman_remove), |
| 828 | .driver = { | 828 | .driver = { |
| 829 | .name = PLATFORM_DRIVER | 829 | .name = PLATFORM_DRIVER |
| 830 | } | 830 | } |
| @@ -833,7 +833,7 @@ static struct platform_driver snd_portman_driver = { | |||
| 833 | /********************************************************************* | 833 | /********************************************************************* |
| 834 | * module init stuff | 834 | * module init stuff |
| 835 | *********************************************************************/ | 835 | *********************************************************************/ |
| 836 | static void snd_portman_unregister_all(void) | 836 | static void __init_or_module snd_portman_unregister_all(void) |
| 837 | { | 837 | { |
| 838 | int i; | 838 | int i; |
| 839 | 839 | ||
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index 3a86a5820726..838a4277929d 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c | |||
| @@ -327,7 +327,7 @@ static void snd_uart16550_buffer_timer(unsigned long data) | |||
| 327 | * return 0 if found | 327 | * return 0 if found |
| 328 | * return negative error if not found | 328 | * return negative error if not found |
| 329 | */ | 329 | */ |
| 330 | static int __init snd_uart16550_detect(struct snd_uart16550 *uart) | 330 | static int __devinit snd_uart16550_detect(struct snd_uart16550 *uart) |
| 331 | { | 331 | { |
| 332 | unsigned long io_base = uart->base; | 332 | unsigned long io_base = uart->base; |
| 333 | int ok; | 333 | int ok; |
| @@ -781,7 +781,7 @@ static int snd_uart16550_dev_free(struct snd_device *device) | |||
| 781 | return snd_uart16550_free(uart); | 781 | return snd_uart16550_free(uart); |
| 782 | } | 782 | } |
| 783 | 783 | ||
| 784 | static int __init snd_uart16550_create(struct snd_card *card, | 784 | static int __devinit snd_uart16550_create(struct snd_card *card, |
| 785 | unsigned long iobase, | 785 | unsigned long iobase, |
| 786 | int irq, | 786 | int irq, |
| 787 | unsigned int speed, | 787 | unsigned int speed, |
| @@ -860,7 +860,7 @@ static int __init snd_uart16550_create(struct snd_card *card, | |||
| 860 | return 0; | 860 | return 0; |
| 861 | } | 861 | } |
| 862 | 862 | ||
| 863 | static void __init snd_uart16550_substreams(struct snd_rawmidi_str *stream) | 863 | static void __devinit snd_uart16550_substreams(struct snd_rawmidi_str *stream) |
| 864 | { | 864 | { |
| 865 | struct snd_rawmidi_substream *substream; | 865 | struct snd_rawmidi_substream *substream; |
| 866 | 866 | ||
| @@ -869,7 +869,7 @@ static void __init snd_uart16550_substreams(struct snd_rawmidi_str *stream) | |||
| 869 | } | 869 | } |
| 870 | } | 870 | } |
| 871 | 871 | ||
| 872 | static int __init snd_uart16550_rmidi(struct snd_uart16550 *uart, int device, | 872 | static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device, |
| 873 | int outs, int ins, | 873 | int outs, int ins, |
| 874 | struct snd_rawmidi **rmidi) | 874 | struct snd_rawmidi **rmidi) |
| 875 | { | 875 | { |
| @@ -896,7 +896,7 @@ static int __init snd_uart16550_rmidi(struct snd_uart16550 *uart, int device, | |||
| 896 | return 0; | 896 | return 0; |
| 897 | } | 897 | } |
| 898 | 898 | ||
| 899 | static int __init snd_serial_probe(struct platform_device *devptr) | 899 | static int __devinit snd_serial_probe(struct platform_device *devptr) |
| 900 | { | 900 | { |
| 901 | struct snd_card *card; | 901 | struct snd_card *card; |
| 902 | struct snd_uart16550 *uart; | 902 | struct snd_uart16550 *uart; |
| @@ -981,7 +981,7 @@ static int __init snd_serial_probe(struct platform_device *devptr) | |||
| 981 | return err; | 981 | return err; |
| 982 | } | 982 | } |
| 983 | 983 | ||
| 984 | static int snd_serial_remove(struct platform_device *devptr) | 984 | static int __devexit snd_serial_remove(struct platform_device *devptr) |
| 985 | { | 985 | { |
| 986 | snd_card_free(platform_get_drvdata(devptr)); | 986 | snd_card_free(platform_get_drvdata(devptr)); |
| 987 | platform_set_drvdata(devptr, NULL); | 987 | platform_set_drvdata(devptr, NULL); |
| @@ -992,7 +992,7 @@ static int snd_serial_remove(struct platform_device *devptr) | |||
| 992 | 992 | ||
| 993 | static struct platform_driver snd_serial_driver = { | 993 | static struct platform_driver snd_serial_driver = { |
| 994 | .probe = snd_serial_probe, | 994 | .probe = snd_serial_probe, |
| 995 | .remove = snd_serial_remove, | 995 | .remove = __devexit_p( snd_serial_remove), |
| 996 | .driver = { | 996 | .driver = { |
| 997 | .name = SND_SERIAL_DRIVER | 997 | .name = SND_SERIAL_DRIVER |
| 998 | }, | 998 | }, |
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index 59171f8200df..70e70baa3bc8 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c | |||
| @@ -85,7 +85,7 @@ struct snd_card_virmidi { | |||
| 85 | static struct platform_device *devices[SNDRV_CARDS]; | 85 | static struct platform_device *devices[SNDRV_CARDS]; |
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | static int __init snd_virmidi_probe(struct platform_device *devptr) | 88 | static int __devinit snd_virmidi_probe(struct platform_device *devptr) |
| 89 | { | 89 | { |
| 90 | struct snd_card *card; | 90 | struct snd_card *card; |
| 91 | struct snd_card_virmidi *vmidi; | 91 | struct snd_card_virmidi *vmidi; |
| @@ -129,7 +129,7 @@ static int __init snd_virmidi_probe(struct platform_device *devptr) | |||
| 129 | return err; | 129 | return err; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | static int snd_virmidi_remove(struct platform_device *devptr) | 132 | static int __devexit snd_virmidi_remove(struct platform_device *devptr) |
| 133 | { | 133 | { |
| 134 | snd_card_free(platform_get_drvdata(devptr)); | 134 | snd_card_free(platform_get_drvdata(devptr)); |
| 135 | platform_set_drvdata(devptr, NULL); | 135 | platform_set_drvdata(devptr, NULL); |
| @@ -140,7 +140,7 @@ static int snd_virmidi_remove(struct platform_device *devptr) | |||
| 140 | 140 | ||
| 141 | static struct platform_driver snd_virmidi_driver = { | 141 | static struct platform_driver snd_virmidi_driver = { |
| 142 | .probe = snd_virmidi_probe, | 142 | .probe = snd_virmidi_probe, |
| 143 | .remove = snd_virmidi_remove, | 143 | .remove = __devexit_p(snd_virmidi_remove), |
| 144 | .driver = { | 144 | .driver = { |
| 145 | .name = SND_VIRMIDI_DRIVER | 145 | .name = SND_VIRMIDI_DRIVER |
| 146 | }, | 146 | }, |