ALSA: Kill snd_assert() in other places

Kill snd_assert() in other places, 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, 18 insertions, 28 deletions

diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 106c48225bba..7bd33e6552ab 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -319,7 +319,8 @@ static void awacs_amp_set_master(struct awacs_amp *amp, int vol)
 static void awacs_amp_free(struct snd_pmac *chip)
 {
         struct awacs_amp *amp = chip->mixer_data;
-        snd_assert(amp, return);
+        if (!amp)
+                return;
         kfree(amp);
         chip->mixer_data = NULL;
         chip->mixer_free = NULL;
@@ -345,8 +346,7 @@ static int snd_pmac_awacs_get_volume_amp(struct snd_kcontrol *kcontrol,
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         int index = kcontrol->private_value;
         struct awacs_amp *amp = chip->mixer_data;
-        snd_assert(amp, return -EINVAL);
-        snd_assert(index >= 0 && index <= 1, return -EINVAL);
+
         ucontrol->value.integer.value[0] = 31 - (amp->amp_vol[index][0] & 31);
         ucontrol->value.integer.value[1] = 31 - (amp->amp_vol[index][1] & 31);
         return 0;
@@ -359,8 +359,6 @@ static int snd_pmac_awacs_put_volume_amp(struct snd_kcontrol *kcontrol,
         int index = kcontrol->private_value;
         int vol[2];
         struct awacs_amp *amp = chip->mixer_data;
-        snd_assert(amp, return -EINVAL);
-        snd_assert(index >= 0 && index <= 1, return -EINVAL);
 
         vol[0] = (31 - (ucontrol->value.integer.value[0] & 31))
                 | (amp->amp_vol[index][0] & 32);
@@ -375,8 +373,7 @@ static int snd_pmac_awacs_get_switch_amp(struct snd_kcontrol *kcontrol,
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         int index = kcontrol->private_value;
         struct awacs_amp *amp = chip->mixer_data;
-        snd_assert(amp, return -EINVAL);
-        snd_assert(index >= 0 && index <= 1, return -EINVAL);
+
         ucontrol->value.integer.value[0] = (amp->amp_vol[index][0] & 32)
                                         ? 0 : 1;
         ucontrol->value.integer.value[1] = (amp->amp_vol[index][1] & 32)
@@ -391,8 +388,6 @@ static int snd_pmac_awacs_put_switch_amp(struct snd_kcontrol *kcontrol,
         int index = kcontrol->private_value;
         int vol[2];
         struct awacs_amp *amp = chip->mixer_data;
-        snd_assert(amp, return -EINVAL);
-        snd_assert(index >= 0 && index <= 1, return -EINVAL);
 
         vol[0] = (ucontrol->value.integer.value[0] ? 0 : 32)
                 | (amp->amp_vol[index][0] & 31);
@@ -417,8 +412,7 @@ static int snd_pmac_awacs_get_tone_amp(struct snd_kcontrol *kcontrol,
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         int index = kcontrol->private_value;
         struct awacs_amp *amp = chip->mixer_data;
-        snd_assert(amp, return -EINVAL);
-        snd_assert(index >= 0 && index <= 1, return -EINVAL);
+
         ucontrol->value.integer.value[0] = amp->amp_tone[index];
         return 0;
 }
@@ -430,8 +424,7 @@ static int snd_pmac_awacs_put_tone_amp(struct snd_kcontrol *kcontrol,
         int index = kcontrol->private_value;
         struct awacs_amp *amp = chip->mixer_data;
         unsigned int val;
-        snd_assert(amp, return -EINVAL);
-        snd_assert(index >= 0 && index <= 1, return -EINVAL);
+
         val = ucontrol->value.integer.value[0];
         if (val > 14)
                 return -EINVAL;
@@ -458,7 +451,7 @@ static int snd_pmac_awacs_get_master_amp(struct snd_kcontrol *kcontrol,
 {
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         struct awacs_amp *amp = chip->mixer_data;
-        snd_assert(amp, return -EINVAL);
+
         ucontrol->value.integer.value[0] = amp->amp_master;
         return 0;
 }
@@ -469,7 +462,7 @@ static int snd_pmac_awacs_put_master_amp(struct snd_kcontrol *kcontrol,
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         struct awacs_amp *amp = chip->mixer_data;
         unsigned int val;
-        snd_assert(amp, return -EINVAL);
+
         val = ucontrol->value.integer.value[0];
         if (val > 99)
                 return -EINVAL;
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c
index baa2a7237370..89f5c328acfe 100644
--- a/sound/ppc/beep.c
+++ b/sound/ppc/beep.c
@@ -185,7 +185,8 @@ static int snd_pmac_get_beep(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
-        snd_assert(chip->beep, return -ENXIO);
+        if (snd_BUG_ON(!chip->beep))
+                return -ENXIO;
         ucontrol->value.integer.value[0] = chip->beep->volume;
         return 0;
 }
@@ -195,7 +196,8 @@ static int snd_pmac_put_beep(struct snd_kcontrol *kcontrol,
 {
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         unsigned int oval, nval;
-        snd_assert(chip->beep, return -ENXIO);
+        if (snd_BUG_ON(!chip->beep))
+                return -ENXIO;
         oval = chip->beep->volume;
         nval = ucontrol->value.integer.value[0];
         if (nval > 100)
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 009df8dd37a8..f746e15b8481 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -263,7 +263,7 @@ static int tumbler_get_master_volume(struct snd_kcontrol *kcontrol,
 {
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         struct pmac_tumbler *mix = chip->mixer_data;
-        snd_assert(mix, return -ENODEV);
+
         ucontrol->value.integer.value[0] = mix->master_vol[0];
         ucontrol->value.integer.value[1] = mix->master_vol[1];
         return 0;
@@ -277,7 +277,6 @@ static int tumbler_put_master_volume(struct snd_kcontrol *kcontrol,
         unsigned int vol[2];
         int change;
 
-        snd_assert(mix, return -ENODEV);
         vol[0] = ucontrol->value.integer.value[0];
         vol[1] = ucontrol->value.integer.value[1];
         if (vol[0] >= ARRAY_SIZE(master_volume_table) ||
@@ -299,7 +298,7 @@ static int tumbler_get_master_switch(struct snd_kcontrol *kcontrol,
 {
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         struct pmac_tumbler *mix = chip->mixer_data;
-        snd_assert(mix, return -ENODEV);
+
         ucontrol->value.integer.value[0] = mix->master_switch[0];
         ucontrol->value.integer.value[1] = mix->master_switch[1];
         return 0;
@@ -312,7 +311,6 @@ static int tumbler_put_master_switch(struct snd_kcontrol *kcontrol,
         struct pmac_tumbler *mix = chip->mixer_data;
         int change;
 
-        snd_assert(mix, return -ENODEV);
         change = mix->master_switch[0] != ucontrol->value.integer.value[0] ||
                 mix->master_switch[1] != ucontrol->value.integer.value[1];
         if (change) {
@@ -807,7 +805,6 @@ static int snapper_get_capture_source(struct snd_kcontrol *kcontrol,
         struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
         struct pmac_tumbler *mix = chip->mixer_data;
 
-        snd_assert(mix, return -ENODEV);
         ucontrol->value.enumerated.item[0] = mix->capture_source;
         return 0;
 }
@@ -819,7 +816,6 @@ static int snapper_put_capture_source(struct snd_kcontrol *kcontrol,
         struct pmac_tumbler *mix = chip->mixer_data;
         int change;
 
-        snd_assert(mix, return -ENODEV);
         change = ucontrol->value.enumerated.item[0] != mix->capture_source;
         if (change) {
                 mix->capture_source = !!ucontrol->value.enumerated.item[0];
@@ -978,7 +974,8 @@ static void device_change_handler(struct work_struct *work)
                 return;
 
         mix = chip->mixer_data;
-        snd_assert(mix, return);
+        if (snd_BUG_ON(!mix))
+                return;
 
         headphone = tumbler_detect_headphone(chip);
         lineout = tumbler_detect_lineout(chip);
@@ -1033,7 +1030,8 @@ static void tumbler_update_automute(struct snd_pmac *chip, int do_notify)
         if (chip->auto_mute) {
                 struct pmac_tumbler *mix;
                 mix = chip->mixer_data;
-                snd_assert(mix, return);
+                if (snd_BUG_ON(!mix))
+                        return;
                 mix->auto_mute_notify = do_notify;
                 schedule_work(&device_change);
         }
@@ -1227,8 +1225,6 @@ static void tumbler_resume(struct snd_pmac *chip)
 {
         struct pmac_tumbler *mix = chip->mixer_data;
 
-        snd_assert(mix, return);
-
         mix->acs &= ~1;
         mix->master_switch[0] = mix->save_master_switch[0];
         mix->master_switch[1] = mix->save_master_switch[1];
@@ -1275,7 +1271,6 @@ static int __init tumbler_init(struct snd_pmac *chip)
 {
         int irq;
         struct pmac_tumbler *mix = chip->mixer_data;
-        snd_assert(mix, return -EINVAL);
 
         if (tumbler_find_device("audio-hw-reset",
                                 "platform-do-hw-reset",