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>

1 files changed, 16 insertions, 9 deletions

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 4d6fbb36ab8a..d723543beadd 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -1036,7 +1036,7 @@ static void hdsp_set_dds_value(struct hdsp *hdsp, int rate)
         n = DDS_NUMERATOR;
         div64_32(&n, rate, &r);
         /* n should be less than 2^32 for being written to FREQ register */
-        snd_assert((n >> 32) == 0);
+        snd_BUG_ON(n >> 32);
         /* HDSP_freqReg and HDSP_resetPointer are the same, so keep the DDS
            value to write it after a reset */
         hdsp->dds_value = n;
@@ -3043,7 +3043,7 @@ static int snd_hdsp_get_adat_sync_check(struct snd_kcontrol *kcontrol, struct sn
         struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
 
         offset = ucontrol->id.index - 1;
-        snd_assert(offset >= 0);
+        snd_BUG_ON(offset < 0);
 
         switch (hdsp->io_type) {
         case Digiface:
@@ -3767,7 +3767,8 @@ static char *hdsp_channel_buffer_location(struct hdsp *hdsp,
 {
         int mapped_channel;
 
-        snd_assert(channel >= 0 && channel < hdsp->max_channels, return NULL);
+        if (snd_BUG_ON(channel < 0 || channel >= hdsp->max_channels))
+                return NULL;
         
         if ((mapped_channel = hdsp->channel_map[channel]) < 0)
                 return NULL;
@@ -3784,10 +3785,12 @@ static int snd_hdsp_playback_copy(struct snd_pcm_substream *substream, int chann
         struct hdsp *hdsp = snd_pcm_substream_chip(substream);
         char *channel_buf;
 
-        snd_assert(pos + count <= HDSP_CHANNEL_BUFFER_BYTES / 4, return -EINVAL);
+        if (snd_BUG_ON(pos + count > HDSP_CHANNEL_BUFFER_BYTES / 4))
+                return -EINVAL;
 
         channel_buf = hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);
-        snd_assert(channel_buf != NULL, return -EIO);
+        if (snd_BUG_ON(!channel_buf))
+                return -EIO;
         if (copy_from_user(channel_buf + pos * 4, src, count * 4))
                 return -EFAULT;
         return count;
@@ -3799,10 +3802,12 @@ static int snd_hdsp_capture_copy(struct snd_pcm_substream *substream, int channe
         struct hdsp *hdsp = snd_pcm_substream_chip(substream);
         char *channel_buf;
 
-        snd_assert(pos + count <= HDSP_CHANNEL_BUFFER_BYTES / 4, return -EINVAL);
+        if (snd_BUG_ON(pos + count > HDSP_CHANNEL_BUFFER_BYTES / 4))
+                return -EINVAL;
 
         channel_buf = hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);
-        snd_assert(channel_buf != NULL, return -EIO);
+        if (snd_BUG_ON(!channel_buf))
+                return -EIO;
         if (copy_to_user(dst, channel_buf + pos * 4, count * 4))
                 return -EFAULT;
         return count;
@@ -3815,7 +3820,8 @@ static int snd_hdsp_hw_silence(struct snd_pcm_substream *substream, int channel,
         char *channel_buf;
 
         channel_buf = hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);
-        snd_assert(channel_buf != NULL, return -EIO);
+        if (snd_BUG_ON(!channel_buf))
+                return -EIO;
         memset(channel_buf + pos * 4, 0, count * 4);
         return count;
 }
@@ -3927,7 +3933,8 @@ static int snd_hdsp_channel_info(struct snd_pcm_substream *substream,
         struct hdsp *hdsp = snd_pcm_substream_chip(substream);
         int mapped_channel;
 
-        snd_assert(info->channel < hdsp->max_channels, return -EINVAL);
+        if (snd_BUG_ON(info->channel >= hdsp->max_channels))
+                return -EINVAL;
 
         if ((mapped_channel = hdsp->channel_map[info->channel]) < 0)
                 return -EINVAL;