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

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

@@ -857 +857 @@
         runtime->hw = snd_atiixp_pcm_hw;
         dma->ac97_pcm_type = pcm_type;
-        if ((err = snd_pcm_hw_constraint_list(runtime, 0,
-                                              SNDRV_PCM_HW_PARAM_RATE,
-                                              &hw_constraints_rates)) < 0)
+        err = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                                         &hw_constraints_rates);
+        if (err < 0)
                 return err;
-        if ((err = snd_pcm_hw_constraint_integer(runtime,
-                                                 SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+        err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
+        if (err < 0)
                 return err;
         runtime->private_data = dma;
@@ -1059 +1059 @@
                 return -ENXIO;
 
-        if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus)) < 0)
+        err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus);
+        if (err < 0)
                 return err;
         pbus->clock = clock;
@@ -1073 +1074 @@
                 ac97.num = i;
                 ac97.scaps = AC97_SCAP_SKIP_AUDIO | AC97_SCAP_POWER_SAVE;
-                if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i])) < 0) {
+                err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i]);
+                if (err < 0) {
                         chip->ac97[i] = NULL; /* to be sure */
                         dev_dbg(chip->card->dev,
@@ -1193 +1195 @@
         int err;
 
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
 
@@ -1207 +1210 @@
         chip->pci = pci;
         chip->irq = -1;
-        if ((err = pci_request_regions(pci, "ATI IXP MC97")) < 0) {
+        err = pci_request_regions(pci, "ATI IXP MC97");
+        if (err < 0) {
                 kfree(chip);
                 pci_disable_device(pci);
@@ -1230 +1234 @@
         pci_set_master(pci);
 
-        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_atiixp_free(chip);
                 return err;
@@ -1253 +1258 @@
         strcpy(card->driver, "ATIIXP-MODEM");
         strcpy(card->shortname, "ATI IXP Modem");
-        if ((err = snd_atiixp_create(card, pci, &chip)) < 0)
+        err = snd_atiixp_create(card, pci, &chip);
+        if (err < 0)
                 goto __error;
         card->private_data = chip;
 
-        if ((err = snd_atiixp_aclink_reset(chip)) < 0)
+        err = snd_atiixp_aclink_reset(chip);
+        if (err < 0)
                 goto __error;
 
-        if ((err = snd_atiixp_mixer_new(chip, ac97_clock)) < 0)
+        err = snd_atiixp_mixer_new(chip, ac97_clock);
+        if (err < 0)
                 goto __error;
 
-        if ((err = snd_atiixp_pcm_new(chip)) < 0)
+        err = snd_atiixp_pcm_new(chip);
+        if (err < 0)
                 goto __error;
         
@@ -1273 +1282 @@
                 card->shortname, pci->revision, chip->addr, chip->irq);
 
-        if ((err = snd_card_register(card)) < 0)
+        err = snd_card_register(card);
+        if (err < 0)
                 goto __error;