diff options
Diffstat (limited to 'sound/drivers/virmidi.c')
-rw-r--r-- | sound/drivers/virmidi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index 59171f8200df..46f3d3486067 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c | |||
@@ -44,7 +44,6 @@ | |||
44 | #include <sound/driver.h> | 44 | #include <sound/driver.h> |
45 | #include <linux/init.h> | 45 | #include <linux/init.h> |
46 | #include <linux/wait.h> | 46 | #include <linux/wait.h> |
47 | #include <linux/sched.h> | ||
48 | #include <linux/err.h> | 47 | #include <linux/err.h> |
49 | #include <linux/platform_device.h> | 48 | #include <linux/platform_device.h> |
50 | #include <linux/moduleparam.h> | 49 | #include <linux/moduleparam.h> |
@@ -85,7 +84,7 @@ struct snd_card_virmidi { | |||
85 | static struct platform_device *devices[SNDRV_CARDS]; | 84 | static struct platform_device *devices[SNDRV_CARDS]; |
86 | 85 | ||
87 | 86 | ||
88 | static int __init snd_virmidi_probe(struct platform_device *devptr) | 87 | static int __devinit snd_virmidi_probe(struct platform_device *devptr) |
89 | { | 88 | { |
90 | struct snd_card *card; | 89 | struct snd_card *card; |
91 | struct snd_card_virmidi *vmidi; | 90 | struct snd_card_virmidi *vmidi; |
@@ -129,7 +128,7 @@ static int __init snd_virmidi_probe(struct platform_device *devptr) | |||
129 | return err; | 128 | return err; |
130 | } | 129 | } |
131 | 130 | ||
132 | static int snd_virmidi_remove(struct platform_device *devptr) | 131 | static int __devexit snd_virmidi_remove(struct platform_device *devptr) |
133 | { | 132 | { |
134 | snd_card_free(platform_get_drvdata(devptr)); | 133 | snd_card_free(platform_get_drvdata(devptr)); |
135 | platform_set_drvdata(devptr, NULL); | 134 | platform_set_drvdata(devptr, NULL); |
@@ -140,7 +139,7 @@ static int snd_virmidi_remove(struct platform_device *devptr) | |||
140 | 139 | ||
141 | static struct platform_driver snd_virmidi_driver = { | 140 | static struct platform_driver snd_virmidi_driver = { |
142 | .probe = snd_virmidi_probe, | 141 | .probe = snd_virmidi_probe, |
143 | .remove = snd_virmidi_remove, | 142 | .remove = __devexit_p(snd_virmidi_remove), |
144 | .driver = { | 143 | .driver = { |
145 | .name = SND_VIRMIDI_DRIVER | 144 | .name = SND_VIRMIDI_DRIVER |
146 | }, | 145 | }, |