ALSA: opti9xx: Fix assignment in if condition

ISA Opti9xx driver code contains lots 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, no functional changes.

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

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index a510b20..e1fb756 100644 (file)
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -722,35 +722,43 @@ static int snd_miro_mixer(struct snd_card *card,
        }
 
        for (idx = 0; idx < ARRAY_SIZE(snd_miro_controls); idx++) {
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_controls[idx], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_controls[idx], miro));
+               if (err < 0)
                        return err;
        }
 
        if ((miro->aci->aci_product == 'A') ||
            (miro->aci->aci_product == 'B')) {
                /* PCM1/PCM12 with power-amp and Line 2 */
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_line_control[0], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_line_control[0], miro));
+               if (err < 0)
                        return err;
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_amp_control[0], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_amp_control[0], miro));
+               if (err < 0)
                        return err;
        }
 
        if ((miro->aci->aci_product == 'B') ||
            (miro->aci->aci_product == 'C')) {
                /* PCM12/PCM20 with mic-preamp */
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_preamp_control[0], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_preamp_control[0], miro));
+               if (err < 0)
                        return err;
-               if (miro->aci->aci_version >= 176)
-                       if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_capture_control[0], miro))) < 0)
+               if (miro->aci->aci_version >= 176) {
+                       err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_capture_control[0], miro));
+                       if (err < 0)
                                return err;
+               }
        }
 
        if (miro->aci->aci_product == 'C') {
                /* PCM20 with radio and 7 band equalizer */
-               if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_radio_control[0], miro))) < 0)
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_radio_control[0], miro));
+               if (err < 0)
                        return err;
                for (idx = 0; idx < ARRAY_SIZE(snd_miro_eq_controls); idx++) {
-                       if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_eq_controls[idx], miro))) < 0)
+                       err = snd_ctl_add(card, snd_ctl_new1(&snd_miro_eq_controls[idx], miro));
+                       if (err < 0)
                                return err;
                }
        }
@@ -1178,7 +1186,8 @@ static int snd_card_miro_detect(struct snd_card *card,
 
        for (i = OPTi9XX_HW_82C929; i <= OPTi9XX_HW_82C924; i++) {
 
-               if ((err = snd_miro_init(chip, i)) < 0)
+               err = snd_miro_init(chip, i);
+               if (err < 0)
                        return err;
 
                err = snd_miro_opti_check(chip);

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 08e61d9..4bd1dc6 100644 (file)
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -970,32 +970,37 @@ static int snd_opti9xx_isa_probe(struct device *devptr,
 #endif /* CS4231 || OPTi93X */
 
        if (mpu_port == SNDRV_AUTO_PORT) {
-               if ((mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports, 2)) < 0) {
+               mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports, 2);
+               if (mpu_port < 0) {
                        snd_printk(KERN_ERR "unable to find a free MPU401 port\n");
                        return -EBUSY;
                }
        }
        if (irq == SNDRV_AUTO_IRQ) {
-               if ((irq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
+               irq = snd_legacy_find_free_irq(possible_irqs);
+               if (irq < 0) {
                        snd_printk(KERN_ERR "unable to find a free IRQ\n");
                        return -EBUSY;
                }
        }
        if (mpu_irq == SNDRV_AUTO_IRQ) {
-               if ((mpu_irq = snd_legacy_find_free_irq(possible_mpu_irqs)) < 0) {
+               mpu_irq = snd_legacy_find_free_irq(possible_mpu_irqs);
+               if (mpu_irq < 0) {
                        snd_printk(KERN_ERR "unable to find a free MPU401 IRQ\n");
                        return -EBUSY;
                }
        }
        if (dma1 == SNDRV_AUTO_DMA) {
-               if ((dma1 = snd_legacy_find_free_dma(possible_dma1s)) < 0) {
+               dma1 = snd_legacy_find_free_dma(possible_dma1s);
+               if (dma1 < 0) {
                        snd_printk(KERN_ERR "unable to find a free DMA1\n");
                        return -EBUSY;
                }
        }
 #if defined(CS4231) || defined(OPTi93X)
        if (dma2 == SNDRV_AUTO_DMA) {
-               if ((dma2 = snd_legacy_find_free_dma(possible_dma2s[dma1 % 4])) < 0) {
+               dma2 = snd_legacy_find_free_dma(possible_dma2s[dma1 % 4]);
+               if (dma2 < 0) {
                        snd_printk(KERN_ERR "unable to find a free DMA2\n");
                        return -EBUSY;
                }
@@ -1006,11 +1011,13 @@ static int snd_opti9xx_isa_probe(struct device *devptr,
        if (error < 0)
                return error;
 
-       if ((error = snd_card_opti9xx_detect(card, card->private_data)) < 0) {
+       error = snd_card_opti9xx_detect(card, card->private_data);
+       if (error < 0) {
                snd_card_free(card);
                return error;
        }
-       if ((error = snd_opti9xx_probe(card)) < 0) {
+       error = snd_opti9xx_probe(card);
+       if (error < 0) {
                snd_card_free(card);
                return error;
        }
@@ -1111,7 +1118,8 @@ static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
                return -ENODEV;
        }
 
-       if ((error = snd_opti9xx_init(chip, hw))) {
+       error = snd_opti9xx_init(chip, hw);
+       if (error) {
                snd_card_free(card);
                return error;
        }
@@ -1121,7 +1129,8 @@ static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
                snd_card_free(card);
                return error;
        }
-       if ((error = snd_opti9xx_probe(card)) < 0) {
+       error = snd_opti9xx_probe(card);
+       if (error < 0) {
                snd_card_free(card);
                return error;
        }