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

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

diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 479197c13803edb72e5e83101600f2aebd10c52a..db284b7b88a7342343da831a48544d90f7952580 100644 (file)
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -547,10 +547,9 @@ static int snd_sb16_isa_probe(struct device *pdev, unsigned int dev)
        }
 }
 
-static int snd_sb16_isa_remove(struct device *pdev, unsigned int dev)
+static void snd_sb16_isa_remove(struct device *pdev, unsigned int dev)
 {
        snd_card_free(dev_get_drvdata(pdev));
-       return 0;
 }
 
 #ifdef CONFIG_PM