Changeset 703 for GPL/trunk/alsa-kernel/synth/emux/soundfont.c

Timestamp:

Sep 26, 2021, 6:18:40 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/synth/emux/soundfont.c (modified) (16 diffs)

GPL/trunk/alsa-kernel/synth/emux/soundfont.c

@@ -109 +109 @@
  * although it was designed for the AWE64.
  *
- * The sample_write and callargs pararameters allow a callback into
+ * The sample_write and callargs parameters allow a callback into
  * the actual driver to write sample data to the board or whatever
  * it wants to do with it.
@@ -350 +350 @@
         struct snd_sf_zone *zp;
 
-        if ((zp = kzalloc(sizeof(*zp), GFP_KERNEL)) == NULL)
+        zp = kzalloc(sizeof(*zp), GFP_KERNEL);
+        if (!zp)
                 return NULL;
         zp->next = sf->zones;
@@ -382 +383 @@
         struct snd_sf_sample *sp;
 
-        if ((sp = kzalloc(sizeof(*sp), GFP_KERNEL)) == NULL)
+        sp = kzalloc(sizeof(*sp), GFP_KERNEL);
+        if (!sp)
                 return NULL;
 
@@ -452 +454 @@
 
         /* create a new zone */
-        if ((zp = sf_zone_new(sflist, sf)) == NULL)
+        zp = sf_zone_new(sflist, sf);
+        if (!zp)
                 return -ENOMEM;
 
@@ -515 +518 @@
 
         /* patch must be opened */
-        if ((sf = sflist->currsf) == NULL)
+        sf = sflist->currsf;
+        if (!sf)
                 return -EINVAL;
 
@@ -582 +586 @@
 
                 /* create a new zone */
-                if ((zone = sf_zone_new(sflist, sf)) == NULL) {
+                zone = sf_zone_new(sflist, sf);
+                if (!zone)
                         return -ENOMEM;
-                }
 
                 /* copy the temporary data */
@@ -703 +707 @@
 
         /* patch must be opened */
-        if ((sf = sflist->currsf) == NULL)
+        sf = sflist->currsf;
+        if (!sf)
                 return -EINVAL;
 
@@ -726 +731 @@
 
         /* Allocate a new sample structure */
-        if ((sp = sf_sample_new(sflist, sf)) == NULL)
+        sp = sf_sample_new(sflist, sf);
+        if (!sp)
                 return -ENOMEM;
 
@@ -796 +802 @@
         s = (amount >> 24) & 0x7f;
         low = (amount >> 16) & 0xff;
-        /* linear approxmimation by lower 8 bit */
+        /* linear approximation by lower 8 bit */
         v = (log_tbl[s + 1] * low + log_tbl[s] * (0x100 - low)) >> 8;
         v -= offset;
@@ -961 +967 @@
         if (sf == NULL)
                 return -ENOMEM;
-        if ((smp = sf_sample_new(sflist, sf)) == NULL)
+        smp = sf_sample_new(sflist, sf);
+        if (!smp)
                 return -ENOMEM;
         sample_id = sflist->sample_counter;
@@ -999 +1006 @@
 
         /* set up voice info */
-        if ((zone = sf_zone_new(sflist, sf)) == NULL) {
+        zone = sf_zone_new(sflist, sf);
+        if (!zone) {
                 sf_sample_delete(sflist, sf, smp);
                 return -ENOMEM;
@@ -1184 +1192 @@
 
         /* prepend this zone */
-        if ((index = get_index(cur->bank, cur->instr, cur->v.low)) < 0)
+        index = get_index(cur->bank, cur->instr, cur->v.low);
+        if (index < 0)
                 return;
         cur->next_zone = zone; /* zone link */
@@ -1200 +1209 @@
         struct snd_sf_zone *p;
 
-        if ((index = get_index(zp->bank, zp->instr, zp->v.low)) < 0)
+        index = get_index(zp->bank, zp->instr, zp->v.low);
+        if (index < 0)
                 return;
         for (p = sflist->presets[index]; p; p = p->next_instr) {
@@ -1260 +1270 @@
         struct snd_sf_zone *zp;
 
-        if ((index = get_index(bank, preset, key)) < 0)
+        index = get_index(bank, preset, key);
+        if (index < 0)
                 return NULL;
         for (zp = sflist->presets[index]; zp; zp = zp->next_instr) {
@@ -1389 +1400 @@
         struct snd_sf_list *sflist;
 
-        if ((sflist = kzalloc(sizeof(*sflist), GFP_KERNEL)) == NULL)
+        sflist = kzalloc(sizeof(*sflist), GFP_KERNEL);
+        if (!sflist)
                 return NULL;
 
@@ -1424 +1436 @@
 /*
  * Remove all samples
- * The soundcard should be silet before calling this function.
+ * The soundcard should be silent before calling this function.
  */
 int