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

[sfrench/cifs-2.6.git] / sound / isa / cs423x / cs4231.c

diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index bcbea6962d7eed3684ed1e339f322d14e8882088..c56cbc072918adcb7ab568795b868643e42348b2 100644 (file)
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -135,10 +135,9 @@ out:       snd_card_free(card);
        return error;
 }
 
-static int snd_cs4231_remove(struct device *dev, unsigned int n)
+static void snd_cs4231_remove(struct device *dev, unsigned int n)
 {
        snd_card_free(dev_get_drvdata(dev));
-       return 0;
 }
 
 #ifdef CONFIG_PM