Changeset 703 for GPL/trunk/alsa-kernel/drivers/opl3

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/drivers/opl3/opl3_lib.c (modified) (7 diffs)
• alsa-kernel/drivers/opl3/opl3_midi.c (modified) (1 diff)
• alsa-kernel/drivers/opl3/opl3_oss.c (deleted)
• alsa-kernel/drivers/opl3/opl3_seq.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/drivers/opl3/opl3_lib.c

@@ -244 +244 @@
         tid.device = timer_no;
         tid.subdevice = 0;
-        if ((err = snd_timer_new(opl3->card, "AdLib timer #1", &tid, &timer)) >= 0) {
+        err = snd_timer_new(opl3->card, "AdLib timer #1", &tid, &timer);
+        if (err >= 0) {
                 strcpy(timer->name, "AdLib timer #1");
                 timer->private_data = opl3;
@@ -264 +265 @@
         tid.device = timer_no;
         tid.subdevice = 0;
-        if ((err = snd_timer_new(opl3->card, "AdLib timer #2", &tid, &timer)) >= 0) {
+        err = snd_timer_new(opl3->card, "AdLib timer #2", &tid, &timer);
+        if (err >= 0) {
                 strcpy(timer->name, "AdLib timer #2");
                 timer->private_data = opl3;
@@ -349 +351 @@
         spin_lock_init(&opl3->timer_lock);
 
-        if ((err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &ops)) < 0) {
+        err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &ops);
+        if (err < 0) {
                 snd_opl3_free(opl3);
                 return err;
@@ -397 +400 @@
 
         *ropl3 = NULL;
-        if ((err = snd_opl3_new(card, hardware, &opl3)) < 0)
+        err = snd_opl3_new(card, hardware, &opl3);
+        if (err < 0)
                 return err;
         if (! integrated) {
-                if ((opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)")) == NULL) {
+                opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)");
+                if (!opl3->res_l_port) {
                         snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port);
                         snd_device_free(card, opl3);
                         return -EBUSY;
                 }
-                if (r_port != 0 &&
-                    (opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)")) == NULL) {
-                        snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);
-                        snd_device_free(card, opl3);
-                        return -EBUSY;
+                if (r_port != 0) {
+                        opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)");
+                        if (!opl3->res_r_port) {
+                                snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);
+                                snd_device_free(card, opl3);
+                                return -EBUSY;
+                        }
                 }
         }
@@ -424 +431 @@
         default:
                 opl3->command = &snd_opl2_command;
-                if ((err = snd_opl3_detect(opl3)) < 0) {
+                err = snd_opl3_detect(opl3);
+                if (err < 0) {
                         snd_printd("OPL2/3 chip not detected at 0x%lx/0x%lx\n",
                                    opl3->l_port, opl3->r_port);
@@ -450 +458 @@
         int err;
 
-        if (timer1_dev >= 0)
-                if ((err = snd_opl3_timer1_init(opl3, timer1_dev)) < 0)
+        if (timer1_dev >= 0) {
+                err = snd_opl3_timer1_init(opl3, timer1_dev);
+                if (err < 0)
                         return err;
+        }
         if (timer2_dev >= 0) {
-                if ((err = snd_opl3_timer2_init(opl3, timer2_dev)) < 0) {
+                err = snd_opl3_timer2_init(opl3, timer2_dev);
+                if (err < 0) {
                         snd_device_free(opl3->card, opl3->timer1);
                         opl3->timer1 = NULL;
@@ -478 +489 @@
         /* create hardware dependent device (direct FM) */
 
-        if ((err = snd_hwdep_new(card, "OPL2/OPL3", device, &hw)) < 0) {
+        err = snd_hwdep_new(card, "OPL2/OPL3", device, &hw);
+        if (err < 0) {
                 snd_device_free(card, opl3);
                 return err;

GPL/trunk/alsa-kernel/drivers/opl3/opl3_midi.c

@@ -181 +181 @@
                                 /* kill two voices, EXPENSIVE */
                                 bp++;
-                                voice_time = (voice_time > vp->time) ?
-                                        voice_time : vp->time;
+                                voice_time = max(voice_time, vp2->time);
                         }
                 } else {

GPL/trunk/alsa-kernel/drivers/opl3/opl3_seq.c

@@ -96 +96 @@
         int err;
 
-        if ((err = snd_opl3_synth_setup(opl3)) < 0)
+        err = snd_opl3_synth_setup(opl3);
+        if (err < 0)
                 return err;
 
@@ -111 +112 @@
 
         if (info->sender.client != SNDRV_SEQ_CLIENT_SYSTEM) {
-                if ((err = snd_opl3_synth_use_inc(opl3)) < 0)
+                err = snd_opl3_synth_use_inc(opl3);
+                if (err < 0)
                         return err;
         }
@@ -231 +233 @@
                 return client;
 
-        if ((err = snd_opl3_synth_create_port(opl3)) < 0) {
+        err = snd_opl3_synth_create_port(opl3);
+        if (err < 0) {
                 snd_seq_delete_kernel_client(client);
                 opl3->seq_client = -1;