ALSA: au88x0: Fix assignment in if condition

PCI AU88x0 driver code contains a lot of assignments in if condition,
which is a bad coding style that may confuse readers and occasionally
lead to bugs.

This patch is merely for coding-style fixes.  A potential real fix is
about the PCI AGP bridge management refcount in addition while spotted
out during conversions.

Link: https://lore.kernel.org/r/20210608140540.17885-36-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 1b37b72..1f7fee4 100644 (file)
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -46,8 +46,9 @@ MODULE_DEVICE_TABLE(pci, snd_vortex_ids);
 static void vortex_fix_latency(struct pci_dev *vortex)
 {
        int rc;
-       if (!(rc = pci_write_config_byte(vortex, 0x40, 0xff))) {
-                       dev_info(&vortex->dev, "vortex latency is 0xff\n");
+       rc = pci_write_config_byte(vortex, 0x40, 0xff);
+       if (!rc) {
+               dev_info(&vortex->dev, "vortex latency is 0xff\n");
        } else {
                dev_warn(&vortex->dev,
                         "could not set vortex latency: pci error 0x%x\n", rc);
@@ -65,9 +66,12 @@ static void vortex_fix_agp_bridge(struct pci_dev *via)
         * read the config and it is not already set
         */
 
-       if (!(rc = pci_read_config_byte(via, 0x42, &value))
-                       && ((value & 0x10)
-                               || !(rc = pci_write_config_byte(via, 0x42, value | 0x10)))) {
+       rc = pci_read_config_byte(via, 0x42, &value);
+       if (!rc) {
+               if (!(value & 0x10))
+                       rc = pci_write_config_byte(via, 0x42, value | 0x10);
+       }
+       if (!rc) {
                dev_info(&via->dev, "bridge config is 0x%x\n", value | 0x10);
        } else {
                dev_warn(&via->dev,
@@ -102,14 +106,16 @@ static void snd_vortex_workaround(struct pci_dev *vortex, int fix)
        } else {
                if (fix & 0x1)
                        vortex_fix_latency(vortex);
-               if ((fix & 0x2) && (via = pci_get_device(PCI_VENDOR_ID_VIA,
-                               PCI_DEVICE_ID_VIA_8365_1, NULL)))
-                       vortex_fix_agp_bridge(via);
-               if ((fix & 0x4) && (via = pci_get_device(PCI_VENDOR_ID_VIA,
-                               PCI_DEVICE_ID_VIA_82C598_1, NULL)))
-                       vortex_fix_agp_bridge(via);
-               if ((fix & 0x8) && (via = pci_get_device(PCI_VENDOR_ID_AMD,
-                               PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL)))
+               if (fix & 0x2)
+                       via = pci_get_device(PCI_VENDOR_ID_VIA,
+                                            PCI_DEVICE_ID_VIA_8365_1, NULL);
+               else if (fix & 0x4)
+                       via = pci_get_device(PCI_VENDOR_ID_VIA,
+                                            PCI_DEVICE_ID_VIA_82C598_1, NULL);
+               else if (fix & 0x8)
+                       via = pci_get_device(PCI_VENDOR_ID_AMD,
+                                            PCI_DEVICE_ID_AMD_FE_GATE_7007, NULL);
+               if (via)
                        vortex_fix_agp_bridge(via);
        }
        pci_dev_put(via);
@@ -147,7 +153,8 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
        *rchip = NULL;
 
        // check PCI availability (DMA).
-       if ((err = pci_enable_device(pci)) < 0)
+       err = pci_enable_device(pci);
+       if (err < 0)
                return err;
        if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32))) {
                dev_err(card->dev, "error to set DMA mask\n");
@@ -174,7 +181,8 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
        // (1) PCI resource allocation
        // Get MMIO area
        //
-       if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0)
+       err = pci_request_regions(pci, CARD_NAME_SHORT);
+       if (err)
                goto regions_out;
 
        chip->mmio = pci_ioremap_bar(pci, 0);
@@ -187,14 +195,15 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
        /* Init audio core.
         * This must be done before we do request_irq otherwise we can get spurious
         * interrupts that we do not handle properly and make a mess of things */
-       if ((err = vortex_core_init(chip)) != 0) {
+       err = vortex_core_init(chip);
+       if (err) {
                dev_err(card->dev, "hw core init failed\n");
                goto core_out;
        }
 
-       if ((err = request_irq(pci->irq, vortex_interrupt,
-                              IRQF_SHARED, KBUILD_MODNAME,
-                              chip)) != 0) {
+       err = request_irq(pci->irq, vortex_interrupt,
+                         IRQF_SHARED, KBUILD_MODNAME, chip);
+       if (err) {
                dev_err(card->dev, "cannot grab irq\n");
                goto irq_out;
        }
@@ -205,9 +214,9 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
        // End of PCI setup.
 
        // Register alsa root device.
-       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)
                goto alloc_out;
-       }
 
        *rchip = chip;
 
@@ -252,7 +261,8 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                return err;
 
        // (3)
-       if ((err = snd_vortex_create(card, pci, &chip)) < 0) {
+       err = snd_vortex_create(card, pci, &chip);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }
@@ -278,12 +288,14 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
        }
 #ifndef CHIP_AU8820
        // ADB SPDIF
-       if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_SPDIF, 1)) < 0) {
+       err = snd_vortex_new_pcm(chip, VORTEX_PCM_SPDIF, 1);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }
        // A3D
-       if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_A3D, NR_A3D)) < 0) {
+       err = snd_vortex_new_pcm(chip, VORTEX_PCM_A3D, NR_A3D);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }
@@ -297,12 +309,14 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
         */
 #ifndef CHIP_AU8810
        // WT pcm.
-       if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_WT, NR_WT)) < 0) {
+       err = snd_vortex_new_pcm(chip, VORTEX_PCM_WT, NR_WT);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }
 #endif
-       if ((err = snd_vortex_midi(chip)) < 0) {
+       err = snd_vortex_midi(chip);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }
@@ -327,13 +341,13 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 #endif
 
        // (5)
-       if ((err = pci_read_config_word(pci, PCI_DEVICE_ID,
-                                 &(chip->device))) < 0) {
+       err = pci_read_config_word(pci, PCI_DEVICE_ID, &chip->device);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }       
-       if ((err = pci_read_config_word(pci, PCI_VENDOR_ID,
-                                 &(chip->vendor))) < 0) {
+       err = pci_read_config_word(pci, PCI_VENDOR_ID, &chip->vendor);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }
@@ -352,7 +366,8 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 #endif
 
        // (6)
-       if ((err = snd_card_register(card)) < 0) {
+       err = snd_card_register(card);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }

diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c
index 2db183f..eabaee0 100644 (file)
--- a/sound/pci/au88x0/au88x0_a3d.c
+++ b/sound/pci/au88x0/au88x0_a3d.c
@@ -849,46 +849,50 @@ static int vortex_a3d_register_controls(vortex_t *vortex)
        int err, i;
        /* HRTF controls. */
        for (i = 0; i < NR_A3D; i++) {
-               if ((kcontrol =
-                    snd_ctl_new1(&vortex_a3d_kcontrol, &vortex->a3d[i])) == NULL)
+               kcontrol = snd_ctl_new1(&vortex_a3d_kcontrol, &vortex->a3d[i]);
+               if (!kcontrol)
                        return -ENOMEM;
                kcontrol->id.numid = CTRLID_HRTF;
                kcontrol->info = snd_vortex_a3d_hrtf_info;
                kcontrol->put = snd_vortex_a3d_hrtf_put;
-               if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
+               err = snd_ctl_add(vortex->card, kcontrol);
+               if (err < 0)
                        return err;
        }
        /* ITD controls. */
        for (i = 0; i < NR_A3D; i++) {
-               if ((kcontrol =
-                    snd_ctl_new1(&vortex_a3d_kcontrol, &vortex->a3d[i])) == NULL)
+               kcontrol = snd_ctl_new1(&vortex_a3d_kcontrol, &vortex->a3d[i]);
+               if (!kcontrol)
                        return -ENOMEM;
                kcontrol->id.numid = CTRLID_ITD;
                kcontrol->info = snd_vortex_a3d_itd_info;
                kcontrol->put = snd_vortex_a3d_itd_put;
-               if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
+               err = snd_ctl_add(vortex->card, kcontrol);
+               if (err < 0)
                        return err;
        }
        /* ILD (gains) controls. */
        for (i = 0; i < NR_A3D; i++) {
-               if ((kcontrol =
-                    snd_ctl_new1(&vortex_a3d_kcontrol, &vortex->a3d[i])) == NULL)
+               kcontrol = snd_ctl_new1(&vortex_a3d_kcontrol, &vortex->a3d[i]);
+               if (!kcontrol)
                        return -ENOMEM;
                kcontrol->id.numid = CTRLID_GAINS;
                kcontrol->info = snd_vortex_a3d_ild_info;
                kcontrol->put = snd_vortex_a3d_ild_put;
-               if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
+               err = snd_ctl_add(vortex->card, kcontrol);
+               if (err < 0)
                        return err;
        }
        /* Filter controls. */
        for (i = 0; i < NR_A3D; i++) {
-               if ((kcontrol =
-                    snd_ctl_new1(&vortex_a3d_kcontrol, &vortex->a3d[i])) == NULL)
+               kcontrol = snd_ctl_new1(&vortex_a3d_kcontrol, &vortex->a3d[i]);
+               if (!kcontrol)
                        return -ENOMEM;
                kcontrol->id.numid = CTRLID_FILTER;
                kcontrol->info = snd_vortex_a3d_filter_info;
                kcontrol->put = snd_vortex_a3d_filter_put;
-               if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
+               err = snd_ctl_add(vortex->card, kcontrol);
+               if (err < 0)
                        return err;
        }
        return 0;

diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c
index 5180f1b..2ed5100 100644 (file)
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
@@ -2120,9 +2120,9 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
                                      VORTEX_RESOURCE_DMA);
        } else {
                en = 1;
-               if ((dma =
-                    vortex_adb_checkinout(vortex, NULL, en,
-                                          VORTEX_RESOURCE_DMA)) < 0)
+               dma = vortex_adb_checkinout(vortex, NULL, en,
+                                           VORTEX_RESOURCE_DMA);
+               if (dma < 0)
                        return -EBUSY;
        }
 
@@ -2140,18 +2140,20 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
                /* Get SRC and MIXER hardware resources. */
                if (stream->type != VORTEX_PCM_SPDIF) {
                        for (i = 0; i < nr_ch; i++) {
-                               if ((src[i] = vortex_adb_checkinout(vortex,
-                                                          stream->resources, en,
-                                                          VORTEX_RESOURCE_SRC)) < 0) {
+                               src[i] = vortex_adb_checkinout(vortex,
+                                                              stream->resources, en,
+                                                              VORTEX_RESOURCE_SRC);
+                               if (src[i] < 0) {
                                        memset(stream->resources, 0,
                                               sizeof(stream->resources));
                                        return -EBUSY;
                                }
                                if (stream->type != VORTEX_PCM_A3D) {
-                                       if ((mix[i] = vortex_adb_checkinout(vortex,
-                                                                  stream->resources,
-                                                                  en,
-                                                                  VORTEX_RESOURCE_MIXIN)) < 0) {
+                                       mix[i] = vortex_adb_checkinout(vortex,
+                                                                      stream->resources,
+                                                                      en,
+                                                                      VORTEX_RESOURCE_MIXIN);
+                                       if (mix[i] < 0) {
                                                memset(stream->resources,
                                                       0,
                                                       sizeof(stream->resources));
@@ -2162,10 +2164,10 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
                }
 #ifndef CHIP_AU8820
                if (stream->type == VORTEX_PCM_A3D) {
-                       if ((a3d =
-                            vortex_adb_checkinout(vortex,
-                                                  stream->resources, en,
-                                                  VORTEX_RESOURCE_A3D)) < 0) {
+                       a3d = vortex_adb_checkinout(vortex,
+                                                   stream->resources, en,
+                                                   VORTEX_RESOURCE_A3D);
+                       if (a3d < 0) {
                                memset(stream->resources, 0,
                                       sizeof(stream->resources));
                                dev_err(vortex->card->dev,
@@ -2278,19 +2280,18 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
 
                /* Get SRC and MIXER hardware resources. */
                for (i = 0; i < nr_ch; i++) {
-                       if ((mix[i] =
-                            vortex_adb_checkinout(vortex,
-                                                  stream->resources, en,
-                                                  VORTEX_RESOURCE_MIXOUT))
-                           < 0) {
+                       mix[i] = vortex_adb_checkinout(vortex,
+                                                      stream->resources, en,
+                                                      VORTEX_RESOURCE_MIXOUT);
+                       if (mix[i] < 0) {
                                memset(stream->resources, 0,
                                       sizeof(stream->resources));
                                return -EBUSY;
                        }
-                       if ((src[i] =
-                            vortex_adb_checkinout(vortex,
-                                                  stream->resources, en,
-                                                  VORTEX_RESOURCE_SRC)) < 0) {
+                       src[i] = vortex_adb_checkinout(vortex,
+                                                      stream->resources, en,
+                                                      VORTEX_RESOURCE_SRC);
+                       if (src[i] < 0) {
                                memset(stream->resources, 0,
                                       sizeof(stream->resources));
                                return -EBUSY;

diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c
index 58e92f2..71c1310 100644 (file)
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.c
@@ -873,29 +873,33 @@ static int vortex_eq_init(vortex_t *vortex)
 
        vortex_Eqlzr_init(vortex);
 
-       if ((kcontrol =
-            snd_ctl_new1(&vortex_eqtoggle_kcontrol, vortex)) == NULL)
+       kcontrol = snd_ctl_new1(&vortex_eqtoggle_kcontrol, vortex);
+       if (!kcontrol)
                return -ENOMEM;
        kcontrol->private_value = 0;
-       if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
+       err = snd_ctl_add(vortex->card, kcontrol);
+       if (err < 0)
                return err;
 
        /* EQ gain controls */
        for (i = 0; i < 10; i++) {
-               if ((kcontrol =
-                    snd_ctl_new1(&vortex_eq_kcontrol, vortex)) == NULL)
+               kcontrol = snd_ctl_new1(&vortex_eq_kcontrol, vortex);
+               if (!kcontrol)
                        return -ENOMEM;
                snprintf(kcontrol->id.name, sizeof(kcontrol->id.name),
                        "%s Playback Volume", EqBandLabels[i]);
                kcontrol->private_value = i;
-               if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
+               err = snd_ctl_add(vortex->card, kcontrol);
+               if (err < 0)
                        return err;
                //vortex->eqctrl[i] = kcontrol;
        }
        /* EQ band levels */
-       if ((kcontrol = snd_ctl_new1(&vortex_levels_kcontrol, vortex)) == NULL)
+       kcontrol = snd_ctl_new1(&vortex_levels_kcontrol, vortex);
+       if (!kcontrol)
                return -ENOMEM;
-       if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
+       err = snd_ctl_add(vortex->card, kcontrol);
+       if (err < 0)
                return err;
 
        return 0;

diff --git a/sound/pci/au88x0/au88x0_mixer.c b/sound/pci/au88x0/au88x0_mixer.c
index 5b64768..aeba684 100644 (file)
--- a/sound/pci/au88x0/au88x0_mixer.c
+++ b/sound/pci/au88x0/au88x0_mixer.c
@@ -30,7 +30,8 @@ static int snd_vortex_mixer(vortex_t *vortex)
                .read = vortex_codec_read,
        };
 
-       if ((err = snd_ac97_bus(vortex->card, 0, &ops, NULL, &pbus)) < 0)
+       err = snd_ac97_bus(vortex->card, 0, &ops, NULL, &pbus);
+       if (err < 0)
                return err;
        memset(&ac97, 0, sizeof(ac97));
        // Initialize AC97 codec stuff.

diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c
index 603494e..164f6b7 100644 (file)
--- a/sound/pci/au88x0/au88x0_mpu401.c
+++ b/sound/pci/au88x0/au88x0_mpu401.c
@@ -68,9 +68,9 @@ static int snd_vortex_midi(vortex_t *vortex)
 
        /* Create MPU401 instance. */
 #ifdef VORTEX_MPU401_LEGACY
-       if ((temp =
-            snd_mpu401_uart_new(vortex->card, 0, MPU401_HW_MPU401, 0x330,
-                                MPU401_INFO_IRQ_HOOK, -1, &rmidi)) != 0) {
+       temp = snd_mpu401_uart_new(vortex->card, 0, MPU401_HW_MPU401, 0x330,
+                                  MPU401_INFO_IRQ_HOOK, -1, &rmidi);
+       if (temp) {
                hwwrite(vortex->mmio, VORTEX_CTRL,
                        (hwread(vortex->mmio, VORTEX_CTRL) &
                         ~CTRL_MIDI_PORT) & ~CTRL_MIDI_EN);
@@ -78,10 +78,10 @@ static int snd_vortex_midi(vortex_t *vortex)
        }
 #else
        port = (unsigned long)(vortex->mmio + VORTEX_MIDI_DATA);
-       if ((temp =
-            snd_mpu401_uart_new(vortex->card, 0, MPU401_HW_AUREAL, port,
-                                MPU401_INFO_INTEGRATED | MPU401_INFO_MMIO |
-                                MPU401_INFO_IRQ_HOOK, -1, &rmidi)) != 0) {
+       temp = snd_mpu401_uart_new(vortex->card, 0, MPU401_HW_AUREAL, port,
+                                  MPU401_INFO_INTEGRATED | MPU401_INFO_MMIO |
+                                  MPU401_INFO_IRQ_HOOK, -1, &rmidi);
+       if (temp) {
                hwwrite(vortex->mmio, VORTEX_CTRL,
                        (hwread(vortex->mmio, VORTEX_CTRL) &
                         ~CTRL_MIDI_PORT) & ~CTRL_MIDI_EN);

diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index d019aa5..546f712 100644 (file)
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -130,14 +130,14 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)
        int err;
        
        /* Force equal size periods */
-       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;
        /* Avoid PAGE_SIZE boundary to fall inside of a period. */
-       if ((err =
-            snd_pcm_hw_constraint_pow2(runtime, 0,
-                                       SNDRV_PCM_HW_PARAM_PERIOD_BYTES)) < 0)
+       err = snd_pcm_hw_constraint_pow2(runtime, 0,
+                                        SNDRV_PCM_HW_PARAM_PERIOD_BYTES);
+       if (err < 0)
                return err;
 
        snd_pcm_hw_constraint_step(runtime, 0,
@@ -658,7 +658,8 @@ static int snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
                        kctl = snd_ctl_new1(&snd_vortex_mixer_spdif[i], chip);
                        if (!kctl)
                                return -ENOMEM;
-                       if ((err = snd_ctl_add(chip->card, kctl)) < 0)
+                       err = snd_ctl_add(chip->card, kctl);
+                       if (err < 0)
                                return err;
                }
        }