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

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

@@ -297 +297 @@
         unsigned char v;
         for (i = 0; i < WRITE_LOOP_TIMEOUT; i++) {
-                if (!(v = inb(SLSB_REG(chip, READSTATUS)) & 0x80)) {
+                v = inb(SLSB_REG(chip, READSTATUS));
+                if (!(v & 0x80)) {
                         outb(cmd, SLSB_REG(chip, WRITEDATA));
                         return;
@@ -313 +314 @@
         int i;
         unsigned char v;
-        for (i = GET_LOOP_TIMEOUT; i; i--)
-                if ((v = inb(SLSB_REG(chip, STATUS))) & 0x80)
+        for (i = GET_LOOP_TIMEOUT; i; i--) {
+                v = inb(SLSB_REG(chip, STATUS));
+                if (v & 0x80)
                         return inb(SLSB_REG(chip, READDATA));
+        }
         dev_err(chip->card->dev, "get_byte timeout: status 0x02%x\n", v);
         return -ENODEV;
@@ -997 +1000 @@
         int err;
 
-        if ((err = snd_pcm_new(chip->card, "es-1938-1946", device, 2, 1, &pcm)) < 0)
+        err = snd_pcm_new(chip->card, "es-1938-1946", device, 2, 1, &pcm);
+        if (err < 0)
                 return err;
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_es1938_playback_ops);
@@ -1589 +1593 @@
 
         /* 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 */
@@ -1609 +1614 @@
         chip->pci = pci;
         chip->irq = -1;
-        if ((err = pci_request_regions(pci, "ESS Solo-1")) < 0) {
+        err = pci_request_regions(pci, "ESS Solo-1");
+        if (err < 0) {
                 kfree(chip);
                 pci_disable_device(pci);
@@ -1635 +1641 @@
         snd_es1938_chip_init(chip);
 
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (err < 0) {
                 snd_es1938_free(chip);
                 return err;
@@ -1767 +1774 @@
                                 break;
                         }
-                if ((err = snd_ctl_add(card, kctl)) < 0)
+                err = snd_ctl_add(card, kctl);
+                if (err < 0)
                         return err;
         }
@@ -1801 +1809 @@
                 }
         }
-        if ((err = snd_es1938_create(card, pci, &chip)) < 0) {
+        err = snd_es1938_create(card, pci, &chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1814 +1823 @@
                 chip->irq);
 
-        if ((err = snd_es1938_new_pcm(chip, 0)) < 0) {
+        err = snd_es1938_new_pcm(chip, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_es1938_mixer(chip)) < 0) {
+        err = snd_es1938_mixer(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1829 +1840 @@
                            SLSB_REG(chip, FMLOWADDR));
         } else {
-                if ((err = snd_opl3_timer_new(opl3, 0, 1)) < 0) {
+                err = snd_opl3_timer_new(opl3, 0, 1);
+                if (err < 0) {
                         snd_card_free(card);
                         return err;
                 }
-                if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
+                err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
+                if (err < 0) {
                         snd_card_free(card);
                         return err;
@@ -1851 +1864 @@
         snd_es1938_create_gameport(chip);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;