3 files changed, 15 insertions, 24 deletions

diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 0c63e0585b15..49acee0c4840 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -765,7 +765,6 @@ static int __devinit snd_amd7930_pcm(struct snd_amd7930 *amd)
                                /* playback count */ 1,
                                /* capture count */  1, &pcm)) < 0)
                 return err;
-        snd_assert(pcm != NULL, return -EINVAL);
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_amd7930_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_amd7930_capture_ops);
@@ -788,13 +787,6 @@ static int __devinit snd_amd7930_pcm(struct snd_amd7930 *amd)
 
 static int snd_amd7930_info_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem_info *uinfo)
 {
-        int type = kctl->private_value;
-
-        snd_assert(type == VOLUME_MONITOR ||
-                   type == VOLUME_CAPTURE ||
-                   type == VOLUME_PLAYBACK, return -EINVAL);
-        (void) type;
-
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = 1;
         uinfo->value.integer.min = 0;
@@ -809,10 +801,6 @@ static int snd_amd7930_get_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem
         int type = kctl->private_value;
         int *swval;
 
-        snd_assert(type == VOLUME_MONITOR ||
-                   type == VOLUME_CAPTURE ||
-                   type == VOLUME_PLAYBACK, return -EINVAL);
-
         switch (type) {
         case VOLUME_MONITOR:
                 swval = &amd->mgain;
@@ -838,10 +826,6 @@ static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem
         int type = kctl->private_value;
         int *swval, change;
 
-        snd_assert(type == VOLUME_MONITOR ||
-                   type == VOLUME_CAPTURE ||
-                   type == VOLUME_PLAYBACK, return -EINVAL);
-
         switch (type) {
         case VOLUME_MONITOR:
                 swval = &amd->mgain;
@@ -904,7 +888,8 @@ static int __devinit snd_amd7930_mixer(struct snd_amd7930 *amd)
         struct snd_card *card;
         int idx, err;
 
-        snd_assert(amd != NULL && amd->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!amd || !amd->card))
+                return -EINVAL;
 
         card = amd->card;
         strcpy(card->mixername, card->shortname);
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 1c4797be72ee..791d2fb821d1 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1560,7 +1560,8 @@ static int __init snd_cs4231_mixer(struct snd_card *card)
         struct snd_cs4231 *chip = card->private_data;
         int err, idx;
 
-        snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL);
+        if (snd_BUG_ON(!chip || !chip->pcm))
+                return -EINVAL;
 
         strcpy(card->mixername, chip->pcm->name);
 
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index ee2e1b4f3551..c534a2a849fa 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2223,7 +2223,6 @@ static int __devinit snd_dbri_pcm(struct snd_card *card)
                                /* playback count */ 1,
                                /* capture count */  1, &pcm)) < 0)
                 return err;
-        snd_assert(pcm != NULL, return -EINVAL);
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_dbri_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_dbri_ops);
@@ -2263,9 +2262,10 @@ static int snd_cs4215_get_volume(struct snd_kcontrol *kcontrol,
 {
         struct snd_dbri *dbri = snd_kcontrol_chip(kcontrol);
         struct dbri_streaminfo *info;
-        snd_assert(dbri != NULL, return -EINVAL);
+
+        if (snd_BUG_ON(!dbri))
+                return -EINVAL;
         info = &dbri->stream_info[kcontrol->private_value];
-        snd_assert(info != NULL, return -EINVAL);
 
         ucontrol->value.integer.value[0] = info->left_gain;
         ucontrol->value.integer.value[1] = info->right_gain;
@@ -2331,7 +2331,9 @@ static int snd_cs4215_get_single(struct snd_kcontrol *kcontrol,
         int shift = (kcontrol->private_value >> 8) & 0xff;
         int mask = (kcontrol->private_value >> 16) & 0xff;
         int invert = (kcontrol->private_value >> 24) & 1;
-        snd_assert(dbri != NULL, return -EINVAL);
+
+        if (snd_BUG_ON(!dbri))
+                return -EINVAL;
 
         if (elem < 4)
                 ucontrol->value.integer.value[0] =
@@ -2356,7 +2358,9 @@ static int snd_cs4215_put_single(struct snd_kcontrol *kcontrol,
         int invert = (kcontrol->private_value >> 24) & 1;
         int changed = 0;
         unsigned short val;
-        snd_assert(dbri != NULL, return -EINVAL);
+
+        if (snd_BUG_ON(!dbri))
+                return -EINVAL;
 
         val = (ucontrol->value.integer.value[0] & mask);
         if (invert == 1)
@@ -2432,7 +2436,8 @@ static int __devinit snd_dbri_mixer(struct snd_card *card)
         int idx, err;
         struct snd_dbri *dbri;
 
-        snd_assert(card != NULL && card->private_data != NULL, return -EINVAL);
+        if (snd_BUG_ON(!card || !card->private_data))
+                return -EINVAL;
         dbri = card->private_data;
 
         strcpy(card->mixername, card->shortname);