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

[linux-2.6-omap-h63xx.git] / sound / pci / ymfpci / ymfpci_main.c

diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 92d49aadf579666a0c837ab692678fc414fece28..90d0d62bd0b40648406bd1db328c280fc572dbfe 100644 (file)
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -259,8 +259,10 @@ static int snd_ymfpci_voice_alloc(struct snd_ymfpci *chip,
        unsigned long flags;
        int result;
        
-       snd_assert(rvoice != NULL, return -EINVAL);
-       snd_assert(!pair || type == YMFPCI_PCM, return -EINVAL);
+       if (snd_BUG_ON(!rvoice))
+               return -EINVAL;
+       if (snd_BUG_ON(pair && type != YMFPCI_PCM))
+               return -EINVAL;
        
        spin_lock_irqsave(&chip->voice_lock, flags);
        for (;;) {
@@ -278,7 +280,8 @@ static int snd_ymfpci_voice_free(struct snd_ymfpci *chip, struct snd_ymfpci_voic
 {
        unsigned long flags;
        
-       snd_assert(pvoice != NULL, return -EINVAL);
+       if (snd_BUG_ON(!pvoice))
+               return -EINVAL;
        snd_ymfpci_hw_stop(chip);
        spin_lock_irqsave(&chip->voice_lock, flags);
        if (pvoice->number == chip->src441_used) {
@@ -494,7 +497,8 @@ static void snd_ymfpci_pcm_init_voice(struct snd_ymfpci_pcm *ypcm, unsigned int
        u8 use_left, use_right;
        unsigned long flags;
 
-       snd_assert(voice != NULL, return);
+       if (snd_BUG_ON(!voice))
+               return;
        if (runtime->channels == 1) {
                use_left = 1;
                use_right = 1;
@@ -1813,7 +1817,8 @@ int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch)
        }
 
        /* add S/PDIF control */
-       snd_assert(chip->pcm_spdif != NULL, return -EIO);
+       if (snd_BUG_ON(!chip->pcm_spdif))
+               return -ENXIO;
        if ((err = snd_ctl_add(chip->card, kctl = snd_ctl_new1(&snd_ymfpci_spdif_default, chip))) < 0)
                return err;
        kctl->id.device = chip->pcm_spdif->device;
@@ -2133,7 +2138,8 @@ static int __devinit snd_ymfpci_memalloc(struct snd_ymfpci *chip)
        chip->work_base = ptr;
        chip->work_base_addr = ptr_addr;
        
-       snd_assert(ptr + chip->work_size == chip->work_ptr.area + chip->work_ptr.bytes, );
+       snd_BUG_ON(ptr + chip->work_size !=
+                  chip->work_ptr.area + chip->work_ptr.bytes);
 
        snd_ymfpci_writel(chip, YDSXGR_PLAYCTRLBASE, chip->bank_base_playback_addr);
        snd_ymfpci_writel(chip, YDSXGR_RECCTRLBASE, chip->bank_base_capture_addr);
@@ -2168,7 +2174,8 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip)
 {
        u16 ctrl;
 
-       snd_assert(chip != NULL, return -EINVAL);
+       if (snd_BUG_ON(!chip))
+               return -EINVAL;
 
        if (chip->res_reg_area) {       /* don't touch busy hardware */
                snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0);