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

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

@@ -836 +836 @@
 
         /* enable PCI device */
-        if ((err = pci_enable_device(pci)) < 0) {
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
-        }
+
         /* check, if we can restrict PCI DMA transfers to 24 bits */
         if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(24))) {
@@ -846 +847 @@
         }
 
-        if ((err = pci_request_regions(pci, "ALS4000")) < 0) {
+        err = pci_request_regions(pci, "ALS4000");
+        if (err < 0) {
                 pci_disable_device(pci);
                 return err;
@@ -873 +875 @@
         snd_als4000_set_addr(acard->iobase, 0, 0, 0, 0);
 
-        if ((err = snd_sbdsp_create(card,
-                                    iobase + ALS4K_IOB_10_ADLIB_ADDR0,
-                                    pci->irq,
+        err = snd_sbdsp_create(card,
+                               iobase + ALS4K_IOB_10_ADLIB_ADDR0,
+                               pci->irq,
                 /* internally registered as IRQF_SHARED in case of ALS4000 SB */
-                                    snd_als4000_interrupt,
-                                    -1,
-                                    -1,
-                                    SB_HW_ALS4000,
-                                    &chip)) < 0) {
+                               snd_als4000_interrupt,
+                               -1,
+                               -1,
+                               SB_HW_ALS4000,
+                               &chip);
+        if (err < 0)
                 goto out_err;
-        }
         acard->chip = chip;
 
@@ -896 +898 @@
                 card->shortname, chip->alt_port, chip->irq);
 
-        if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000,
-                                        iobase + ALS4K_IOB_30_MIDI_DATA,
-                                        MPU401_INFO_INTEGRATED |
-                                        MPU401_INFO_IRQ_HOOK,
-                                        -1, &chip->rmidi)) < 0) {
+        err = snd_mpu401_uart_new(card, 0, MPU401_HW_ALS4000,
+                                  iobase + ALS4K_IOB_30_MIDI_DATA,
+                                  MPU401_INFO_INTEGRATED |
+                                  MPU401_INFO_IRQ_HOOK,
+                                  -1, &chip->rmidi);
+        if (err < 0) {
                 dev_err(&pci->dev, "no MPU-401 device at 0x%lx?\n",
                                 iobase + ALS4K_IOB_30_MIDI_DATA);
@@ -911 +914 @@
          * SPECS_PAGE: 21 */
 
-        if ((err = snd_als4000_pcm(chip, 0)) < 0) {
+        err = snd_als4000_pcm(chip, 0);
+        if (err < 0)
                 goto out_err;
-        }
-        if ((err = snd_sbmixer_new(chip)) < 0) {
+
+        err = snd_sbmixer_new(chip);
+        if (err < 0)
                 goto out_err;
-        }           
 
         if (snd_opl3_create(card,
@@ -926 +930 @@
                            iobase + ALS4K_IOB_12_ADLIB_ADDR2);
         } else {
-                if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
+                err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
+                if (err < 0)
                         goto out_err;
-                }
         }
 
         snd_als4000_create_gameport(acard, dev);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0)
                 goto out_err;
-        }
+
         pci_set_drvdata(pci, card);
         dev++;