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

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

@@ -1072 +1072 @@
         };
 
-        if ((err = snd_ac97_bus(card, 0, &ops, chip, &chip->ac97_bus)) < 0)
+        err = snd_ac97_bus(card, 0, &ops, chip, &chip->ac97_bus);
+        if (err < 0)
                 return err;
         chip->ac97_bus->private_free = snd_cs4281_mixer_free_ac97_bus;
@@ -1079 +1080 @@
         ac97.private_data = chip;
         ac97.private_free = snd_cs4281_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->dual_codec) {
                 ac97.num = 1;
-                if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_secondary)) < 0)
+                err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_secondary);
+                if (err < 0)
                         return err;
         }
-        if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4281_fm_vol, chip))) < 0)
+        err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4281_fm_vol, chip));
+        if (err < 0)
                 return err;
-        if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4281_pcm_vol, chip))) < 0)
+        err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4281_pcm_vol, chip));
+        if (err < 0)
                 return err;
         return 0;
@@ -1312 +1317 @@
 
         *rchip = NULL;
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
@@ -1330 +1336 @@
         chip->dual_codec = dual_codec;
 
-        if ((err = pci_request_regions(pci, "CS4281")) < 0) {
+        err = pci_request_regions(pci, "CS4281");
+        if (err < 0) {
                 kfree(chip);
                 pci_disable_device(pci);
@@ -1360 +1367 @@
         }
 
-        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_cs4281_free(chip);
                 return err;
@@ -1399 +1407 @@
         snd_cs4281_pokeBA0(chip, BA0_CWPR, 0x4281);
         
-        if ((tmp = snd_cs4281_peekBA0(chip, BA0_SERC1)) != (BA0_SERC1_SO1EN | BA0_SERC1_AC97)) {
+        tmp = snd_cs4281_peekBA0(chip, BA0_SERC1);
+        if (tmp != (BA0_SERC1_SO1EN | BA0_SERC1_AC97)) {
                 dev_err(chip->card->dev,
                         "SERC1 AC'97 check failed (0x%x)\n", tmp);
                 return -EIO;
         }
-        if ((tmp = snd_cs4281_peekBA0(chip, BA0_SERC2)) != (BA0_SERC2_SI1EN | BA0_SERC2_AC97)) {
+        tmp = snd_cs4281_peekBA0(chip, BA0_SERC2);
+        if (tmp != (BA0_SERC2_SI1EN | BA0_SERC2_AC97)) {
                 dev_err(chip->card->dev,
                         "SERC2 AC'97 check failed (0x%x)\n", tmp);
@@ -1752 +1762 @@
         int err;
 
-        if ((err = snd_rawmidi_new(chip->card, "CS4281", device, 1, 1, &rmidi)) < 0)
+        err = snd_rawmidi_new(chip->card, "CS4281", device, 1, 1, &rmidi);
+        if (err < 0)
                 return err;
         strcpy(rmidi->name, "CS4281");
@@ -1885 +1896 @@
                 return err;
 
-        if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) {
+        err = snd_cs4281_create(card, pci, &chip, dual_codec[dev]);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1891 +1903 @@
         card->private_data = chip;
 
-        if ((err = snd_cs4281_mixer(chip)) < 0) {
+        err = snd_cs4281_mixer(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_cs4281_pcm(chip, 0)) < 0) {
+        err = snd_cs4281_pcm(chip, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_cs4281_midi(chip, 0)) < 0) {
+        err = snd_cs4281_midi(chip, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_opl3_new(card, OPL3_HW_OPL3_CS4281, &opl3)) < 0) {
+        err = snd_opl3_new(card, OPL3_HW_OPL3_CS4281, &opl3);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1910 +1926 @@
         opl3->command = snd_cs4281_opl3_command;
         snd_opl3_init(opl3);
-        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;
@@ -1922 +1939 @@
                 chip->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;