Changeset 703 for GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci.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/pci/ymfpci/ymfpci.c (modified) (11 diffs)

GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci.c

@@ -77 +77 @@
                 if (io_port == 1) {
                         /* auto-detect */
-                        if (!(io_port = pci_resource_start(chip->pci, 2)))
+                        io_port = pci_resource_start(chip->pci, 2);
+                        if (!io_port)
                                 return -ENODEV;
                 }
@@ -86 +87 @@
                                 if (io_port == 0x203)
                                         continue;
-                                if ((r = request_region(io_port, 1, "YMFPCI gameport")) != NULL)
+                                r = request_region(io_port, 1, "YMFPCI gameport");
+                                if (r)
                                         break;
                         }
@@ -107 +109 @@
         }
 
-        if (!r && !(r = request_region(io_port, 1, "YMFPCI gameport"))) {
-                dev_err(chip->card->dev,
-                        "joystick port %#x is in use.\n", io_port);
-                return -EBUSY;
+        if (!r) {
+                r = request_region(io_port, 1, "YMFPCI gameport");
+                if (!r) {
+                        dev_err(chip->card->dev,
+                                "joystick port %#x is in use.\n", io_port);
+                        return -EBUSY;
+                }
         }
 
@@ -198 +203 @@
                         fm_port[dev] = pci_resource_start(pci, 1);
                 }
-                if (fm_port[dev] > 0 &&
-                    (fm_res = request_region(fm_port[dev], 4, "YMFPCI OPL3")) != NULL) {
+                if (fm_port[dev] > 0)
+                        fm_res = request_region(fm_port[dev], 4, "YMFPCI OPL3");
+                if (fm_res) {
                         legacy_ctrl |= YMFPCI_LEGACY_FMEN;
                         pci_write_config_word(pci, PCIR_DSXG_FMBASE, fm_port[dev]);
@@ -207 +213 @@
                         mpu_port[dev] = pci_resource_start(pci, 1) + 0x20;
                 }
-                if (mpu_port[dev] > 0 &&
-                    (mpu_res = request_region(mpu_port[dev], 2, "YMFPCI MPU401")) != NULL) {
+                if (mpu_port[dev] > 0)
+                        mpu_res = request_region(mpu_port[dev], 2, "YMFPCI MPU401");
+                if (mpu_res) {
                         legacy_ctrl |= YMFPCI_LEGACY_MEN;
                         pci_write_config_word(pci, PCIR_DSXG_MPU401BASE, mpu_port[dev]);
@@ -220 +227 @@
                 default: fm_port[dev] = 0; break;
                 }
-                if (fm_port[dev] > 0 &&
-                    (fm_res = request_region(fm_port[dev], 4, "YMFPCI OPL3")) != NULL) {
+                if (fm_port[dev] > 0)
+                        fm_res = request_region(fm_port[dev], 4, "YMFPCI OPL3");
+                if (fm_res) {
                         legacy_ctrl |= YMFPCI_LEGACY_FMEN;
                 } else {
@@ -234 +242 @@
                 default: mpu_port[dev] = 0; break;
                 }
-                if (mpu_port[dev] > 0 &&
-                    (mpu_res = request_region(mpu_port[dev], 2, "YMFPCI MPU401")) != NULL) {
+                if (mpu_port[dev] > 0)
+                        mpu_res = request_region(mpu_port[dev], 2, "YMFPCI MPU401");
+                if (mpu_res) {
                         legacy_ctrl |= YMFPCI_LEGACY_MEN;
                 } else {
@@ -249 +258 @@
         pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl);
         pci_write_config_word(pci, PCIR_DSXG_ELEGACY, legacy_ctrl2);
-        if ((err = snd_ymfpci_create(card, pci,
-                                     old_legacy_ctrl,
-                                     &chip)) < 0) {
+        err = snd_ymfpci_create(card, pci, old_legacy_ctrl, &chip);
+        if (err  < 0) {
                 release_and_free_resource(mpu_res);
                 release_and_free_resource(fm_res);
@@ -292 +300 @@
 
         if (chip->mpu_res) {
-                if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_YMFPCI,
-                                               mpu_port[dev],
-                                               MPU401_INFO_INTEGRATED |
-                                               MPU401_INFO_IRQ_HOOK,
-                                               -1, &chip->rawmidi)) < 0) {
+                err = snd_mpu401_uart_new(card, 0, MPU401_HW_YMFPCI,
+                                          mpu_port[dev],
+                                          MPU401_INFO_INTEGRATED |
+                                          MPU401_INFO_IRQ_HOOK,
+                                          -1, &chip->rawmidi);
+                if (err < 0) {
                         dev_warn(card->dev,
                                  "cannot initialize MPU401 at 0x%lx, skipping...\n",
@@ -305 +314 @@
         }
         if (chip->fm_res) {
-                if ((err = snd_opl3_create(card,
-                                           fm_port[dev],
-                                           fm_port[dev] + 2,
-                                           OPL3_HW_OPL3, 1, &opl3)) < 0) {
+                err = snd_opl3_create(card,
+                                      fm_port[dev],
+                                      fm_port[dev] + 2,
+                                      OPL3_HW_OPL3, 1, &opl3);
+                if (err < 0) {
                         dev_warn(card->dev,
                                  "cannot initialize FM OPL3 at 0x%lx, skipping...\n",
@@ -314 +324 @@
                         legacy_ctrl &= ~YMFPCI_LEGACY_FMEN;
                         pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl);
-                } else if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
-                        dev_err(card->dev, "cannot create opl3 hwdep\n");
-                        goto free_card;
+                } else {
+                        err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
+                        if (err < 0) {
+                                dev_err(card->dev, "cannot create opl3 hwdep\n");
+                                goto free_card;
+                        }
                 }
         }