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>

5 files changed, 14 insertions, 7 deletions

diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c
index dab31b2756a6..03391da8c8c7 100644
--- a/sound/pci/ice1712/ak4xxx.c
+++ b/sound/pci/ice1712/ak4xxx.c
@@ -59,7 +59,8 @@ static void snd_ice1712_akm4xxx_write(struct snd_akm4xxx *ak, int chip,
         struct snd_ak4xxx_private *priv = (void *)ak->private_value[0];
         struct snd_ice1712 *ice = ak->private_data[0];
 
-        snd_assert(chip >= 0 && chip < 4, return);
+        if (snd_BUG_ON(chip < 0 || chip >= 4))
+                return;
 
         tmp = snd_ice1712_gpio_read(ice);
         tmp |= priv->add_flags;
diff --git a/sound/pci/ice1712/ews.c b/sound/pci/ice1712/ews.c
index 013fc4f04822..6fe35b812040 100644
--- a/sound/pci/ice1712/ews.c
+++ b/sound/pci/ice1712/ews.c
@@ -149,7 +149,8 @@ static int snd_ice1712_ews88mt_chip_select(struct snd_ice1712 *ice, int chip_mas
         struct ews_spec *spec = ice->spec;
         unsigned char data, ndata;
 
-        snd_assert(chip_mask >= 0 && chip_mask <= 0x0f, return -EINVAL);
+        if (snd_BUG_ON(chip_mask < 0 || chip_mask > 0x0f))
+                return -EINVAL;
         snd_i2c_lock(ice->i2c);
         if (snd_i2c_readbytes(spec->i2cdevs[EWS_I2C_PCF2], &data, 1) != 1)
                 goto __error;
@@ -685,7 +686,8 @@ static int snd_ice1712_ews88mt_input_sense_get(struct snd_kcontrol *kcontrol, st
         int channel = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
         unsigned char data;
 
-        snd_assert(channel >= 0 && channel <= 7, return 0);
+        if (snd_BUG_ON(channel < 0 || channel > 7))
+                return 0;
         snd_i2c_lock(ice->i2c);
         if (snd_i2c_readbytes(spec->i2cdevs[EWS_I2C_PCF1], &data, 1) != 1) {
                 snd_i2c_unlock(ice->i2c);
@@ -705,7 +707,8 @@ static int snd_ice1712_ews88mt_input_sense_put(struct snd_kcontrol *kcontrol, st
         int channel = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
         unsigned char data, ndata;
 
-        snd_assert(channel >= 0 && channel <= 7, return 0);
+        if (snd_BUG_ON(channel < 0 || channel > 7))
+                return 0;
         snd_i2c_lock(ice->i2c);
         if (snd_i2c_readbytes(spec->i2cdevs[EWS_I2C_PCF1], &data, 1) != 1) {
                 snd_i2c_unlock(ice->i2c);
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 29d449d73c98..05ffab65d167 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2416,7 +2416,8 @@ int __devinit snd_ice1712_spdif_build_controls(struct snd_ice1712 *ice)
         int err;
         struct snd_kcontrol *kctl;
 
-        snd_assert(ice->pcm_pro != NULL, return -EIO);
+        if (snd_BUG_ON(!ice->pcm_pro))
+                return -EIO;
         err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_default, ice));
         if (err < 0)
                 return err;
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index e596d777d9dd..60119d220a66 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2250,7 +2250,8 @@ static int __devinit snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice)
         int err;
         struct snd_kcontrol *kctl;
 
-        snd_assert(ice->pcm != NULL, return -EIO);
+        if (snd_BUG_ON(!ice->pcm))
+                return -EIO;
 
         err = snd_ctl_add(ice->card, snd_ctl_new1(&snd_vt1724_mixer_pro_spdif_route, ice));
         if (err < 0)
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index b4e0c16852a6..21ff4de890b4 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -208,7 +208,8 @@ static void juli_akm_write(struct snd_akm4xxx *ak, int chip,
 {
         struct snd_ice1712 *ice = ak->private_data[0];
          
-        snd_assert(chip == 0, return);
+        if (snd_BUG_ON(chip))
+                return;
         snd_vt1724_write_i2c(ice, AK4358_ADDR, addr, data);
 }