diff options
Diffstat (limited to 'sound/drivers/serial-u16550.c')
-rw-r--r-- | sound/drivers/serial-u16550.c | 14 |
1 files changed, 7 insertions, 7 deletions
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 | }, |