ALSA: Kill snd_assert() in sound/pci/*

Kill snd_assert() in sound/pci/*, either removed or replaced with
if () with snd_BUG_ON().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

4 files changed, 31 insertions, 18 deletions

diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 3dd0c7963273..2d0dce649a64 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -708,7 +708,7 @@ static int snd_mixart_playback_open(struct snd_pcm_substream *subs)
                 pcm_number = MIXART_PCM_ANALOG;
                 runtime->hw = snd_mixart_analog_caps;
         } else {
-                snd_assert ( pcm == chip->pcm_dig ); 
+                snd_BUG_ON(pcm != chip->pcm_dig);
                 pcm_number = MIXART_PCM_DIGITAL;
                 runtime->hw = snd_mixart_digital_caps;
         }
@@ -783,7 +783,7 @@ static int snd_mixart_capture_open(struct snd_pcm_substream *subs)
                 pcm_number = MIXART_PCM_ANALOG;
                 runtime->hw = snd_mixart_analog_caps;
         } else {
-                snd_assert ( pcm == chip->pcm_dig ); 
+                snd_BUG_ON(pcm != chip->pcm_dig);
                 pcm_number = MIXART_PCM_DIGITAL;
                 runtime->hw = snd_mixart_digital_caps;
         }
diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c
index 785085e48353..b9a06c279397 100644
--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -56,8 +56,10 @@ static int retrieve_msg_frame(struct mixart_mgr *mgr, u32 *msg_frame)
         if (tailptr == headptr)
                 return 0; /* no message posted */
 
-        snd_assert( tailptr >= MSG_OUTBOUND_POST_STACK, return 0); /* error */
-        snd_assert( tailptr < (MSG_OUTBOUND_POST_STACK+MSG_BOUND_STACK_SIZE), return 0); /* error */
+        if (tailptr < MSG_OUTBOUND_POST_STACK)
+                return 0; /* error */
+        if (tailptr >= MSG_OUTBOUND_POST_STACK + MSG_BOUND_STACK_SIZE)
+                return 0; /* error */
 
         *msg_frame = readl_be(MIXART_MEM(mgr, tailptr));
 
@@ -149,7 +151,8 @@ static int send_msg( struct mixart_mgr *mgr,
         u32 msg_frame_address;
         int err, i;
 
-        snd_assert(msg->size % 4 == 0, return -EINVAL);
+        if (snd_BUG_ON(msg->size % 4))
+                return -EINVAL;
 
         err = 0;
 
@@ -289,9 +292,12 @@ int snd_mixart_send_msg_wait_notif(struct mixart_mgr *mgr,
         wait_queue_t wait;
         long timeout;
 
-        snd_assert(notif_event != 0, return -EINVAL);
-        snd_assert((notif_event & MSG_TYPE_MASK) == MSG_TYPE_NOTIFY, return -EINVAL);
-        snd_assert((notif_event & MSG_CANCEL_NOTIFY_MASK) == 0, return -EINVAL);
+        if (snd_BUG_ON(!notif_event))
+                return -EINVAL;
+        if (snd_BUG_ON((notif_event & MSG_TYPE_MASK) != MSG_TYPE_NOTIFY))
+                return -EINVAL;
+        if (snd_BUG_ON(notif_event & MSG_CANCEL_NOTIFY_MASK))
+                return -EINVAL;
 
         mutex_lock(&mgr->msg_mutex);
 
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index f98603146132..3782b52bc0e8 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -288,7 +288,9 @@ static int mixart_enum_physio(struct mixart_mgr *mgr)
                 return -EINVAL;
         }
 
-        snd_assert(phys_io.nb_uid >= (MIXART_MAX_CARDS * 2),  return -EINVAL); /* min 2 phys io per card (analog in + analog out) */
+        /* min 2 phys io per card (analog in + analog out) */
+        if (phys_io.nb_uid < MIXART_MAX_CARDS * 2)
+                return -EINVAL;
 
         for(k=0; k<mgr->num_cards; k++) {
                 mgr->chip[k]->uid_in_analog_physio = phys_io.uid[k];
@@ -363,8 +365,10 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
                 }
 
                 /* check xilinx validity */
-                snd_assert(((u32*)(dsp->data))[0]==0xFFFFFFFF, return -EINVAL);
-                snd_assert(dsp->size % 4 == 0, return -EINVAL);
+                if (((u32*)(dsp->data))[0] == 0xffffffff)
+                        return -EINVAL;
+                if (dsp->size % 4)
+                        return -EINVAL;
 
                 /* set xilinx status to copying */
                 writel_be( 1, MIXART_MEM( mgr, MIXART_PSEUDOREG_MXLX_STATUS_OFFSET ));
@@ -462,8 +466,10 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
                 }
  
                 /* check daughterboard xilinx validity */
-                snd_assert(((u32*)(dsp->data))[0]==0xFFFFFFFF, return -EINVAL);
-                snd_assert(dsp->size % 4 == 0, return -EINVAL);
+                if (((u32*)(dsp->data))[0] == 0xffffffff)
+                        return -EINVAL;
+                if (dsp->size % 4)
+                        return -EINVAL;
 
                 /* inform mixart about the size of the file */
                 writel_be( dsp->size, MIXART_MEM( mgr, MIXART_PSEUDOREG_DXLX_SIZE_OFFSET ));
@@ -480,7 +486,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
 
                 /* get the address where to write the file */
                 val = readl_be( MIXART_MEM( mgr, MIXART_PSEUDOREG_DXLX_BASE_ADDR_OFFSET ));
-                snd_assert(val != 0, return -EINVAL);
+                if (!val)
+                        return -EINVAL;
 
                 /* copy daughterboard xilinx code */
                 memcpy_toio(  MIXART_MEM( mgr, val),  dsp->data,  dsp->size);
diff --git a/sound/pci/mixart/mixart_mixer.c b/sound/pci/mixart/mixart_mixer.c
index 6fdda1f70b25..3ba6174c3df1 100644
--- a/sound/pci/mixart/mixart_mixer.c
+++ b/sound/pci/mixart/mixart_mixer.c
@@ -837,7 +837,7 @@ static int mixart_pcm_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
                 if(is_aes)      stored_volume = chip->digital_capture_volume[1];        /* AES capture */
                 else            stored_volume = chip->digital_capture_volume[0];        /* analog capture */
         } else {
-                snd_assert ( idx < MIXART_PLAYBACK_STREAMS ); 
+                snd_BUG_ON(idx >= MIXART_PLAYBACK_STREAMS);
                 if(is_aes)      stored_volume = chip->digital_playback_volume[MIXART_PLAYBACK_STREAMS + idx]; /* AES playback */
                 else            stored_volume = chip->digital_playback_volume[idx];     /* analog playback */
         }
@@ -863,7 +863,7 @@ static int mixart_pcm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
                 else            /* analog capture */
                         stored_volume = chip->digital_capture_volume[0];
         } else {
-                snd_assert ( idx < MIXART_PLAYBACK_STREAMS ); 
+                snd_BUG_ON(idx >= MIXART_PLAYBACK_STREAMS);
                 if (is_aes)     /* AES playback */
                         stored_volume = chip->digital_playback_volume[MIXART_PLAYBACK_STREAMS + idx];
                 else            /* analog playback */
@@ -909,7 +909,7 @@ static int mixart_pcm_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_
 {
         struct snd_mixart *chip = snd_kcontrol_chip(kcontrol);
         int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); /* index */
-        snd_assert ( idx < MIXART_PLAYBACK_STREAMS ); 
+        snd_BUG_ON(idx >= MIXART_PLAYBACK_STREAMS);
         mutex_lock(&chip->mgr->mixer_mutex);
         if(kcontrol->private_value & MIXART_VOL_AES_MASK)       /* AES playback */
                 idx += MIXART_PLAYBACK_STREAMS;
@@ -926,7 +926,7 @@ static int mixart_pcm_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_
         int is_aes = kcontrol->private_value & MIXART_VOL_AES_MASK;
         int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); /* index */
         int i, j;
-        snd_assert ( idx < MIXART_PLAYBACK_STREAMS ); 
+        snd_BUG_ON(idx >= MIXART_PLAYBACK_STREAMS);
         mutex_lock(&chip->mgr->mixer_mutex);
         j = idx;
         if (is_aes)