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

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

@@ -676 +676 @@
                         /* now wait for the stinkin' data (RDY) */
                         for (t = 0; t < POLL_COUNT; t++) {
-                                if ((x = inl(ES_REG(ensoniq, 1371_CODEC))) & ES_1371_CODEC_RDY) {
+                                x = inl(ES_REG(ensoniq, 1371_CODEC));
+                                if (x & ES_1371_CODEC_RDY) {
                                         if (is_ev1938(ensoniq)) {
                                                 for (t = 0; t < 100; t++)
@@ -1598 +1599 @@
         };
 
-        if ((err = snd_ac97_bus(card, 0, &ops, NULL, &pbus)) < 0)
+        err = snd_ac97_bus(card, 0, &ops, NULL, &pbus);
+        if (err < 0)
                 return err;
 
@@ -1606 +1608 @@
         ac97.pci = ensoniq->pci;
         ac97.scaps = AC97_SCAP_AUDIO;
-        if ((err = snd_ac97_mixer(pbus, &ac97, &ensoniq->u.es1371.ac97)) < 0)
+        err = snd_ac97_mixer(pbus, &ac97, &ensoniq->u.es1371.ac97);
+        if (err < 0)
                 return err;
         if (has_spdif > 0 ||
@@ -1726 +1729 @@
         ak4531.private_data = ensoniq;
         ak4531.private_free = snd_ensoniq_mixer_free_ak4531;
-        if ((err = snd_ak4531_mixer(card, &ak4531, &ensoniq->u.es1370.ak4531)) < 0)
+        err = snd_ak4531_mixer(card, &ak4531, &ensoniq->u.es1370.ak4531);
+        if (err < 0)
                 return err;
         for (idx = 0; idx < ES1370_CONTROLS; idx++) {
@@ -2042 +2046 @@
 
         *rensoniq = NULL;
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
         ensoniq = kzalloc(sizeof(*ensoniq), GFP_KERNEL);
@@ -2054 +2059 @@
         ensoniq->pci = pci;
         ensoniq->irq = -1;
-        if ((err = pci_request_regions(pci, "Ensoniq AudioPCI")) < 0) {
+        err = pci_request_regions(pci, "Ensoniq AudioPCI");
+        if (err < 0) {
                 kfree(ensoniq);
                 pci_disable_device(pci);
@@ -2103 +2109 @@
         snd_ensoniq_chip_init(ensoniq);
 
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ensoniq, &ops)) < 0) {
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, ensoniq, &ops);
+        if (err < 0) {
                 snd_ensoniq_free(ensoniq);
                 return err;
@@ -2294 +2301 @@
         int err;
 
-        if ((err = snd_rawmidi_new(ensoniq->card, "ES1370/1", device, 1, 1, &rmidi)) < 0)
+        err = snd_rawmidi_new(ensoniq->card, "ES1370/1", device, 1, 1, &rmidi);
+        if (err < 0)
                 return err;
         strcpy(rmidi->name, CHIP_NAME);
@@ -2365 +2373 @@
                 return err;
 
-        if ((err = snd_ensoniq_create(card, pci, &ensoniq)) < 0) {
+        err = snd_ensoniq_create(card, pci, &ensoniq);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -2372 +2381 @@
 
 #ifdef CHIP1370
-        if ((err = snd_ensoniq_1370_mixer(ensoniq)) < 0) {
+        err = snd_ensoniq_1370_mixer(ensoniq);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -2378 +2388 @@
 #endif
 #ifdef CHIP1371
-        if ((err = snd_ensoniq_1371_mixer(ensoniq, spdif[dev], lineio[dev])) < 0) {
+        err = snd_ensoniq_1371_mixer(ensoniq, spdif[dev], lineio[dev]);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 #endif
-        if ((err = snd_ensoniq_pcm(ensoniq, 0)) < 0) {
+        err = snd_ensoniq_pcm(ensoniq, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_ensoniq_pcm2(ensoniq, 1)) < 0) {
+        err = snd_ensoniq_pcm2(ensoniq, 1);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_ensoniq_midi(ensoniq, 0)) < 0) {
+        err = snd_ensoniq_midi(ensoniq, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -2407 +2421 @@
                 ensoniq->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;