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

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

@@ -83 +83 @@
         ICH_REG_##name##_PIV    = base + 0x0a,  /* byte - prefetched index value */ \
         ICH_REG_##name##_CR     = base + 0x0b,  /* byte - control register */ \
-};
+}
 
 /* busmaster blocks */
@@ -542 +542 @@
         } else {
                 res = iagetword(chip, reg + ac97->num * 0x80);
-                if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) {
+                tmp = igetdword(chip, ICHREG(GLOB_STA));
+                if (tmp & ICH_RCS) {
                         /* reset RCS and preserve other R/WC bits */
                         iputdword(chip, ICHREG(GLOB_STA), tmp &
@@ -563 +564 @@
         if (snd_intel8x0_codec_semaphore(chip, codec) >= 0) {
                 iagetword(chip, codec * 0x80);
-                if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) {
+                tmp = igetdword(chip, ICHREG(GLOB_STA));
+                if (tmp & ICH_RCS) {
                         /* reset RCS and preserve other R/WC bits */
                         iputdword(chip, ICHREG(GLOB_STA), tmp &
@@ -1109 +1111 @@
                 runtime->hw.period_bytes_max = 64*1024;
         }
-        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 = ichdev;
@@ -2194 +2197 @@
                 }
         }
-        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)
                 goto __err;
         pbus->private_free = snd_intel8x0_mixer_free_ac97_bus;
@@ -2210 +2214 @@
         for (i = 0; i < codecs; i++) {
                 ac97.num = i;
-                if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i])) < 0) {
+                err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i]);
+                if (err < 0) {
                         if (err != -EACCES)
                                 dev_err(chip->card->dev,
@@ -2497 +2502 @@
         
         if (chip->device_type != DEVICE_ALI) {
-                if ((err = snd_intel8x0_ich_chip_init(chip, probing)) < 0)
+                err = snd_intel8x0_ich_chip_init(chip, probing);
+                if (err < 0)
                         return err;
                 iagetword(chip, 0);     /* clear semaphore flag */
         } else {
-                if ((err = snd_intel8x0_ali_chip_init(chip, probing)) < 0)
+                err = snd_intel8x0_ali_chip_init(chip, probing);
+                if (err < 0)
                         return err;
         }
@@ -2943 +2950 @@
         *r_intel8x0 = NULL;
 
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
 
@@ -2975 +2983 @@
                 chip->fix_nocache = 1; /* enable workaround */
 
-        if ((err = pci_request_regions(pci, card->shortname)) < 0) {
+        err = pci_request_regions(pci, card->shortname);
+        if (err < 0) {
                 kfree(chip);
                 pci_disable_device(pci);
@@ -3089 +3098 @@
                 chip->codec_isr_bits |= chip->codec_bit[i];
 
-        if ((err = snd_intel8x0_chip_init(chip, 1)) < 0) {
+        err = snd_intel8x0_chip_init(chip, 1);
+        if (err < 0) {
                 snd_intel8x0_free(chip);
                 return err;
@@ -3104 +3114 @@
         card->sync_irq = chip->irq;
 
-        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_intel8x0_free(chip);
                 return err;
@@ -3211 +3222 @@
         }
 
-        if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data,
-                                       &chip)) < 0) {
+        err = snd_intel8x0_create(card, pci, pci_id->driver_data, &chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -3218 +3229 @@
         card->private_data = chip;
 
-        if ((err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk)) < 0) {
+        err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_intel8x0_pcm(chip)) < 0) {
+        err = snd_intel8x0_pcm(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -3242 +3255 @@
         }
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;