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

Kill snd_assert() in sound/isa/*, 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>

3 files changed, 24 insertions, 15 deletions

diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c
index 2efaa7f205aa..dfc449a2194e 100644
--- a/sound/isa/wavefront/wavefront_fx.c
+++ b/sound/isa/wavefront/wavefront_fx.c
@@ -180,11 +180,11 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,
         unsigned short *pd;
         int err = 0;
 
-        snd_assert(sdev->card != NULL, return -ENODEV);
-        
         card = sdev->card;
-
-        snd_assert(card->private_data != NULL, return -ENODEV);
+        if (snd_BUG_ON(!card))
+                return -ENODEV;
+        if (snd_BUG_ON(!card->private_data))
+                return -ENODEV;
 
         acard = card->private_data;
         dev = &acard->wavefront;
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c
index a33384a55b0f..f14a7c0b6998 100644
--- a/sound/isa/wavefront/wavefront_midi.c
+++ b/sound/isa/wavefront/wavefront_midi.c
@@ -235,8 +235,10 @@ static int snd_wavefront_midi_input_open(struct snd_rawmidi_substream *substream
         snd_wavefront_midi_t *midi;
         snd_wavefront_mpu_id mpu;
 
-        snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
-        snd_assert(substream->rmidi->private_data != NULL, return -EIO);
+        if (snd_BUG_ON(!substream || !substream->rmidi))
+                return -ENXIO;
+        if (snd_BUG_ON(!substream->rmidi->private_data))
+                return -ENXIO;
 
         mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
 
@@ -257,8 +259,10 @@ static int snd_wavefront_midi_output_open(struct snd_rawmidi_substream *substrea
         snd_wavefront_midi_t *midi;
         snd_wavefront_mpu_id mpu;
 
-        snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
-        snd_assert(substream->rmidi->private_data != NULL, return -EIO);
+        if (snd_BUG_ON(!substream || !substream->rmidi))
+                return -ENXIO;
+        if (snd_BUG_ON(!substream->rmidi->private_data))
+                return -ENXIO;
 
         mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
 
@@ -279,8 +283,10 @@ static int snd_wavefront_midi_input_close(struct snd_rawmidi_substream *substrea
         snd_wavefront_midi_t *midi;
         snd_wavefront_mpu_id mpu;
 
-        snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
-        snd_assert(substream->rmidi->private_data != NULL, return -EIO);
+        if (snd_BUG_ON(!substream || !substream->rmidi))
+                return -ENXIO;
+        if (snd_BUG_ON(!substream->rmidi->private_data))
+                return -ENXIO;
 
         mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
 
@@ -300,8 +306,10 @@ static int snd_wavefront_midi_output_close(struct snd_rawmidi_substream *substre
         snd_wavefront_midi_t *midi;
         snd_wavefront_mpu_id mpu;
 
-        snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
-        snd_assert(substream->rmidi->private_data != NULL, return -EIO);
+        if (snd_BUG_ON(!substream || !substream->rmidi))
+                return -ENXIO;
+        if (snd_BUG_ON(!substream->rmidi->private_data))
+                return -ENXIO;
 
         mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
 
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 0bb9b9256601..4c410820a994 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1648,9 +1648,10 @@ snd_wavefront_synth_ioctl (struct snd_hwdep *hw, struct file *file,
 
         card = (struct snd_card *) hw->card;
 
-        snd_assert(card != NULL, return -ENODEV);
-
-        snd_assert(card->private_data != NULL, return -ENODEV);
+        if (snd_BUG_ON(!card))
+                return -ENODEV;
+        if (snd_BUG_ON(!card->private_data))
+                return -ENODEV;
 
         acard = card->private_data;
         dev = &acard->wavefront;