ALSA: pcmcia: Fix assignment in if condition

PCMCIA VX222 and PDAudioCF drivers contain a few 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-58-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 144582350a05b959afda768e05b82ec71a54755a..8363ec08df5d9697e5a48ee80b175f96dfc1b089 100644 (file)
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -170,7 +170,8 @@ static int snd_pdacf_assign_resources(struct snd_pdacf *pdacf, int port, int irq
        if (err < 0)
                return err;
 
-       if ((err = snd_card_register(card)) < 0)
+       err = snd_card_register(card);
+       if (err < 0)
                return err;
 
        return 0;

diff --git a/sound/pcmcia/vx/vxp_mixer.c b/sound/pcmcia/vx/vxp_mixer.c
index 0f59e4cca56d6beafe7b248a3d5818410b0a5c6c..bc2114475810c625250cd5763402b89530e12c91 100644 (file)
--- a/sound/pcmcia/vx/vxp_mixer.c
+++ b/sound/pcmcia/vx/vxp_mixer.c
@@ -124,11 +124,13 @@ int vxp_add_mic_controls(struct vx_core *_chip)
        /* mic level */
        switch (_chip->type) {
        case VX_TYPE_VXPOCKET:
-               if ((err = snd_ctl_add(_chip->card, snd_ctl_new1(&vx_control_mic_level, chip))) < 0)
+               err = snd_ctl_add(_chip->card, snd_ctl_new1(&vx_control_mic_level, chip));
+               if (err < 0)
                        return err;
                break;
        case VX_TYPE_VXP440:
-               if ((err = snd_ctl_add(_chip->card, snd_ctl_new1(&vx_control_mic_boost, chip))) < 0)
+               err = snd_ctl_add(_chip->card, snd_ctl_new1(&vx_control_mic_boost, chip));
+               if (err < 0)
                        return err;
                break;
        }

diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c
index 45eeb0f57d590c5dbe0d512da8b0331b1f5f058e..4176abd73799c4338489a93f2ed7d6ebb2fa94fe 100644 (file)
--- a/sound/pcmcia/vx/vxp_ops.c
+++ b/sound/pcmcia/vx/vxp_ops.c
@@ -237,9 +237,11 @@ static int vxp_load_dsp(struct vx_core *vx, int index, const struct firmware *fw
        switch (index) {
        case 0:
                /* xilinx boot */
-               if ((err = vx_check_magic(vx)) < 0)
+               err = vx_check_magic(vx);
+               if (err < 0)
                        return err;
-               if ((err = snd_vx_load_boot_image(vx, fw)) < 0)
+               err = snd_vx_load_boot_image(vx, fw);
+               if (err < 0)
                        return err;
                return 0;
        case 1:

diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 63632048980510ceb1eac4a0d1869d8a095ed259..0dfb6a943b60650d74ceda5ef4db2fe347057a0f 100644 (file)
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -183,7 +183,8 @@ static int snd_vxpocket_assign_resources(struct vx_core *chip, int port, int irq
        chip->irq = irq;
        card->sync_irq = chip->irq;
 
-       if ((err = snd_vx_setup_firmware(chip)) < 0)
+       err = snd_vx_setup_firmware(chip);
+       if (err < 0)
                return err;
 
        return 0;