1 files changed, 5 insertions, 4 deletions

diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index 54df8baf916f..7c920f3e7fe3 100644
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -106,7 +106,8 @@ static void spu_memset(u32 toi, u32 what, int length)
 {
         int i;
         unsigned long flags;
-        snd_assert(length % 4 == 0, return);
+        if (snd_BUG_ON(length % 4))
+                return;
         for (i = 0; i < length; i++) {
                 if (!(i % 8))
                         spu_write_wait();
@@ -589,7 +590,7 @@ static int __devinit add_aicamixer_controls(struct snd_card_aica
         return 0;
 }
 
-static int snd_aica_remove(struct platform_device *devptr)
+static int __devexit snd_aica_remove(struct platform_device *devptr)
 {
         struct snd_card_aica *dreamcastcard;
         dreamcastcard = platform_get_drvdata(devptr);
@@ -601,7 +602,7 @@ static int snd_aica_remove(struct platform_device *devptr)
         return 0;
 }
 
-static int __init snd_aica_probe(struct platform_device *devptr)
+static int __devinit snd_aica_probe(struct platform_device *devptr)
 {
         int err;
         struct snd_card_aica *dreamcastcard;
@@ -650,7 +651,7 @@ static int __init snd_aica_probe(struct platform_device *devptr)
 
 static struct platform_driver snd_aica_driver = {
         .probe = snd_aica_probe,
-        .remove = snd_aica_remove,
+        .remove = __devexit_p(snd_aica_remove),
         .driver = {
                    .name = SND_AICA_DRIVER},
 };