Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[pandora-kernel.git] / sound / drivers / virmidi.c

diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index 429af14..46f3d34 100644 (file)
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -84,7 +84,7 @@ struct snd_card_virmidi {
 static struct platform_device *devices[SNDRV_CARDS];
 
 
 static struct platform_device *devices[SNDRV_CARDS];
 
 

-static int __init snd_virmidi_probe(struct platform_device *devptr)
+static int __devinit snd_virmidi_probe(struct platform_device *devptr)

 {
        struct snd_card *card;
        struct snd_card_virmidi *vmidi;
 {
        struct snd_card *card;
        struct snd_card_virmidi *vmidi;


@@ -128,7 +128,7 @@ static int __init snd_virmidi_probe(struct platform_device *devptr)
        return err;
 }
 
        return err;
 }
 

-static int snd_virmidi_remove(struct platform_device *devptr)
+static int __devexit snd_virmidi_remove(struct platform_device *devptr)

 {
        snd_card_free(platform_get_drvdata(devptr));
        platform_set_drvdata(devptr, NULL);
 {
        snd_card_free(platform_get_drvdata(devptr));
        platform_set_drvdata(devptr, NULL);


@@ -139,7 +139,7 @@ static int snd_virmidi_remove(struct platform_device *devptr)
 
 static struct platform_driver snd_virmidi_driver = {
        .probe          = snd_virmidi_probe,
 
 static struct platform_driver snd_virmidi_driver = {
        .probe          = snd_virmidi_probe,

-       .remove         = snd_virmidi_remove,
+       .remove         = __devexit_p(snd_virmidi_remove),

        .driver         = {
                .name   = SND_VIRMIDI_DRIVER
        },
        .driver         = {
                .name   = SND_VIRMIDI_DRIVER
        },