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

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

@@ -58 +58 @@
         ICH_REG_##name##_PIV    = base + 0x0a,  /* byte - prefetched index value */ \
         ICH_REG_##name##_CR     = base + 0x0b,  /* byte - control register */ \
-};
+}
 
 /* busmaster blocks */
@@ -343 +343 @@
         } 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),
@@ -801 +802 @@
         glob_sta = igetdword(chip, ICHREG(GLOB_STA));
 
-        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_intel8x0m_mixer_free_ac97_bus;
@@ -810 +812 @@
         ac97.pci = chip->pci;
         ac97.num = glob_sta & ICH_SCR ? 1 : 0;
-        if ((err = snd_ac97_mixer(pbus, &ac97, &x97)) < 0) {
+        err = snd_ac97_mixer(pbus, &ac97, &x97);
+        if (err < 0) {
                 dev_err(chip->card->dev,
                         "Unable to initialize codec #%d\n", ac97.num);
@@ -928 +931 @@
         int err;
         
-        if ((err = snd_intel8x0m_ich_chip_init(chip, probing)) < 0)
+        err = snd_intel8x0m_ich_chip_init(chip, probing);
+        if (err < 0)
                 return err;
         iagetword(chip, 0);     /* clear semaphore flag */
@@ -1076 +1080 @@
         *r_intel8x0m = NULL;
 
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
 
@@ -1090 +1095 @@
         chip->irq = -1;
 
-        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);
@@ -1168 +1174 @@
         pci_set_master(pci);
 
-        if ((err = snd_intel8x0m_chip_init(chip, 1)) < 0) {
+        err = snd_intel8x0m_chip_init(chip, 1);
+        if (err < 0) {
                 snd_intel8x0m_free(chip);
                 return err;
@@ -1182 +1189 @@
         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_intel8x0m_free(chip);
                 return err;
@@ -1239 +1247 @@
         strcat(card->shortname," Modem");
 
-        if ((err = snd_intel8x0m_create(card, pci, pci_id->driver_data, &chip)) < 0) {
+        err = snd_intel8x0m_create(card, pci, pci_id->driver_data, &chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1245 +1254 @@
         card->private_data = chip;
 
-        if ((err = snd_intel8x0m_mixer(chip, ac97_clock)) < 0) {
+        err = snd_intel8x0m_mixer(chip, ac97_clock);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_intel8x0m_pcm(chip)) < 0) {
+        err = snd_intel8x0m_pcm(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1259 +1270 @@
                 card->shortname, chip->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;