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

[linux-2.6-omap-h63xx.git] / sound / core / oss / mixer_oss.c

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 3ace4a5680ba532ec394e2dcaef8d8b21eb18c08..4690b8b5681fee9b788e01318de01b63f39f22af 100644 (file)
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/time.h>
@@ -258,8 +257,10 @@ static int snd_mixer_oss_get_volume(struct snd_mixer_oss_file *fmixer, int slot)
                result = pslot->get_volume(fmixer, pslot, &left, &right);
        if (!pslot->stereo)
                right = left;
-       snd_assert(left >= 0 && left <= 100, return -EIO);
-       snd_assert(right >= 0 && right <= 100, return -EIO);
+       if (snd_BUG_ON(left < 0 || left > 100))
+               return -EIO;
+       if (snd_BUG_ON(right < 0 || right > 100))
+               return -EIO;
        if (result >= 0) {
                pslot->volume[0] = left;
                pslot->volume[1] = right;
@@ -299,7 +300,8 @@ static int snd_mixer_oss_ioctl1(struct snd_mixer_oss_file *fmixer, unsigned int
        int __user *p = argp;
        int tmp;
 
-       snd_assert(fmixer != NULL, return -ENXIO);
+       if (snd_BUG_ON(!fmixer))
+               return -ENXIO;
        if (((cmd >> 8) & 0xff) == 'M') {
                switch (cmd) {
                case SOUND_MIXER_INFO:
@@ -369,7 +371,8 @@ int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned l
 {
        struct snd_mixer_oss_file fmixer;
        
-       snd_assert(card != NULL, return -ENXIO);
+       if (snd_BUG_ON(!card))
+               return -ENXIO;
        if (card->mixer_oss == NULL)
                return -ENXIO;
        memset(&fmixer, 0, sizeof(fmixer));
@@ -925,6 +928,68 @@ static void mixer_slot_clear(struct snd_mixer_oss_slot *rslot)
        rslot->number = idx;
 }
 
+/* In a separate function to keep gcc 3.2 happy - do NOT merge this in
+   snd_mixer_oss_build_input! */
+static int snd_mixer_oss_build_test_all(struct snd_mixer_oss *mixer,
+                                       struct snd_mixer_oss_assign_table *ptr,
+                                       struct slot *slot)
+{
+       char str[64];
+       int err;
+
+       err = snd_mixer_oss_build_test(mixer, slot, ptr->name, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_GLOBAL);
+       if (err)
+               return err;
+       sprintf(str, "%s Switch", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_GSWITCH);
+       if (err)
+               return err;
+       sprintf(str, "%s Route", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_GROUTE);
+       if (err)
+               return err;
+       sprintf(str, "%s Volume", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_GVOLUME);
+       if (err)
+               return err;
+       sprintf(str, "%s Playback Switch", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_PSWITCH);
+       if (err)
+               return err;
+       sprintf(str, "%s Playback Route", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_PROUTE);
+       if (err)
+               return err;
+       sprintf(str, "%s Playback Volume", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_PVOLUME);
+       if (err)
+               return err;
+       sprintf(str, "%s Capture Switch", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_CSWITCH);
+       if (err)
+               return err;
+       sprintf(str, "%s Capture Route", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_CROUTE);
+       if (err)
+               return err;
+       sprintf(str, "%s Capture Volume", ptr->name);
+       err = snd_mixer_oss_build_test(mixer, slot, str, ptr->index,
+                                      SNDRV_MIXER_OSS_ITEM_CVOLUME);
+       if (err)
+               return err;
+
+       return 0;
+}
+
 /*
  * build an OSS mixer element.
  * ptr_allocated means the entry is dynamically allocated (change via proc file).
@@ -944,44 +1009,7 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix
 
        memset(&slot, 0, sizeof(slot));
        memset(slot.numid, 0xff, sizeof(slot.numid)); /* ID_UNKNOWN */
-       if (snd_mixer_oss_build_test(mixer, &slot, ptr->name, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_GLOBAL))
-               return 0;
-       sprintf(str, "%s Switch", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_GSWITCH))
-               return 0;
-       sprintf(str, "%s Route", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_GROUTE))
-               return 0;
-       sprintf(str, "%s Volume", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_GVOLUME))
-               return 0;
-       sprintf(str, "%s Playback Switch", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_PSWITCH))
-               return 0;
-       sprintf(str, "%s Playback Route", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_PROUTE))
-               return 0;
-       sprintf(str, "%s Playback Volume", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_PVOLUME))
-               return 0;
-       sprintf(str, "%s Capture Switch", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_CSWITCH))
-               return 0;
-       sprintf(str, "%s Capture Route", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_CROUTE))
-               return 0;
-       sprintf(str, "%s Capture Volume", ptr->name);
-       if (snd_mixer_oss_build_test(mixer, &slot, str, ptr->index,
-                                    SNDRV_MIXER_OSS_ITEM_CVOLUME))
+       if (snd_mixer_oss_build_test_all(mixer, ptr, &slot))
                return 0;
        down_read(&mixer->card->controls_rwsem);
        if (ptr->index == 0 && (kctl = snd_mixer_oss_test_id(mixer, "Capture Source", 0)) != NULL) {
@@ -1233,6 +1261,8 @@ static void snd_mixer_oss_build(struct snd_mixer_oss *mixer)
                { SOUND_MIXER_DIGITAL3, "Digital",              2 },
                { SOUND_MIXER_PHONEIN,  "Phone",                0 },
                { SOUND_MIXER_PHONEOUT, "Master Mono",          0 },
+               { SOUND_MIXER_PHONEOUT, "Speaker",              0 }, /*fallback*/
+               { SOUND_MIXER_PHONEOUT, "Mono",                 0 }, /*fallback*/
                { SOUND_MIXER_PHONEOUT, "Phone",                0 }, /* fallback */
                { SOUND_MIXER_VIDEO,    "Video",                0 },
                { SOUND_MIXER_RADIO,    "Radio",                0 },
@@ -1258,9 +1288,11 @@ static int snd_mixer_oss_free1(void *private)
        struct snd_card *card;
        int idx;
  
-       snd_assert(mixer != NULL, return -ENXIO);
+       if (!mixer)
+               return 0;
        card = mixer->card;
-       snd_assert(mixer == card->mixer_oss, return -ENXIO);
+       if (snd_BUG_ON(mixer != card->mixer_oss))
+               return -ENXIO;
        card->mixer_oss = NULL;
        for (idx = 0; idx < SNDRV_OSS_MAX_MIXERS; idx++) {
                struct snd_mixer_oss_slot *chn = &mixer->slots[idx];