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

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

@@ -668 +668 @@
                                            &hw_constraints_channels);
         }
-        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;
         return 0;
@@ -683 +684 @@
         snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                    &hw_constraints_rates);
-        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;
         return 0;
@@ -726 +728 @@
         int err;
 
-        if ((err = snd_pcm_new(chip->card, "FM801", device, 1, 1, &pcm)) < 0)
+        err = snd_pcm_new(chip->card, "FM801", device, 1, 1, &pcm);
+        if (err < 0)
                 return err;
 
@@ -994 +997 @@
         unsigned short val;
  
-        if ((val = ucontrol->value.enumerated.item[0]) > 4)
+        val = ucontrol->value.enumerated.item[0];
+        if (val > 4)
                 return -EINVAL;
         return snd_fm801_update_bits(chip, FM801_REC_SRC, 7, val);
@@ -1059 +1063 @@
         };
 
-        if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &chip->ac97_bus)) < 0)
+        err = snd_ac97_bus(chip->card, 0, &ops, chip, &chip->ac97_bus);
+        if (err < 0)
                 return err;
         chip->ac97_bus->private_free = snd_fm801_mixer_free_ac97_bus;
@@ -1066 +1071 @@
         ac97.private_data = chip;
         ac97.private_free = snd_fm801_mixer_free_ac97;
-        if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97)) < 0)
+        err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97);
+        if (err < 0)
                 return err;
         if (chip->secondary) {
                 ac97.num = 1;
                 ac97.addr = chip->secondary_addr;
-                if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_sec)) < 0)
+                err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_sec);
+                if (err < 0)
                         return err;
         }
@@ -1223 +1230 @@
         *rchip = NULL;
 #ifndef TARGET_OS2
-        if ((err = pcim_enable_device(pci)) < 0)
+        err = pcim_enable_device(pci);
+        if (err < 0)
                 return err;
         chip = devm_kzalloc(&pci->dev, sizeof(*chip), GFP_KERNEL);
@@ -1238 +1246 @@
         chip->irq = -1;
         chip->tea575x_tuner = tea575x_tuner;
-        if ((err = pci_request_regions(pci, "FM801")) < 0)
+        err = pci_request_regions(pci, "FM801");
+        if (err < 0)
                 return err;
         chip->port = pci_resource_start(pci, 0);
@@ -1278 +1287 @@
         snd_fm801_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_fm801_free(chip);
                 return err;
@@ -1351 +1361 @@
         if (err < 0)
                 return err;
-        if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], radio_nr[dev], &chip)) < 0) {
+        err = snd_fm801_create(card, pci, tea575x_tuner[dev], radio_nr[dev], &chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1366 +1377 @@
                 goto __fm801_tuner_only;
 
-        if ((err = snd_fm801_pcm(chip, 0)) < 0) {
+        err = snd_fm801_pcm(chip, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_fm801_mixer(chip)) < 0) {
+        err = snd_fm801_mixer(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,
-                                       chip->port + FM801_MPU401_DATA,
-                                       MPU401_INFO_INTEGRATED |
-                                       MPU401_INFO_IRQ_HOOK,
-                                       -1, &chip->rmidi)) < 0) {
+        err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,
+                                  chip->port + FM801_MPU401_DATA,
+                                  MPU401_INFO_INTEGRATED |
+                                  MPU401_INFO_IRQ_HOOK,
+                                  -1, &chip->rmidi);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_opl3_create(card, chip->port + FM801_OPL3_BANK0,
-                                   chip->port + FM801_OPL3_BANK1,
-                                   OPL3_HW_OPL3_FM801, 1, &opl3)) < 0) {
+        err = snd_opl3_create(card, chip->port + FM801_OPL3_BANK0,
+                              chip->port + FM801_OPL3_BANK1,
+                              OPL3_HW_OPL3_FM801, 1, &opl3);
+        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;
@@ -1394 +1410 @@
 
       __fm801_tuner_only:
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;