Merge tag 'tags/isa-void-remove-callback' into for-next

[sfrench/cifs-2.6.git] / sound / isa / sb / jazz16.c

diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c
index ee379bbf70a4b75262ffa7331d16fc1ded68cfc2..0e2e0ab3b9e4c6559f07e35c85ebb9be67956943 100644 (file)
--- a/sound/isa/sb/jazz16.c
+++ b/sound/isa/sb/jazz16.c
@@ -339,12 +339,11 @@ err_free:
        return err;
 }
 
-static int snd_jazz16_remove(struct device *devptr, unsigned int dev)
+static void snd_jazz16_remove(struct device *devptr, unsigned int dev)
 {
        struct snd_card *card = dev_get_drvdata(devptr);
 
        snd_card_free(card);
-       return 0;
 }
 
 #ifdef CONFIG_PM