ALSA: mpu401: Fix assignment in if condition

MPU401 driver code contains 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-60-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 8c552e2..d0b55db 100644 (file)
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -104,7 +104,8 @@ static int snd_mpu401_probe(struct platform_device *devptr)
        err = snd_mpu401_create(&devptr->dev, dev, &card);
        if (err < 0)
                return err;
-       if ((err = snd_card_register(card)) < 0) {
+       err = snd_card_register(card);
+       if (err < 0) {
                snd_card_free(card);
                return err;
        }
@@ -182,7 +183,8 @@ static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
                err = snd_mpu401_create(&pnp_dev->dev, dev, &card);
                if (err < 0)
                        return err;
-               if ((err = snd_card_register(card)) < 0) {
+               err = snd_card_register(card);
+               if (err < 0) {
                        snd_card_free(card);
                        return err;
                }
@@ -227,7 +229,8 @@ static int __init alsa_card_mpu401_init(void)
 {
        int i, err;
 
-       if ((err = platform_driver_register(&snd_mpu401_driver)) < 0)
+       err = platform_driver_register(&snd_mpu401_driver);
+       if (err < 0)
                return err;
 
        for (i = 0; i < SNDRV_CARDS; i++) {

diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index 65982d6..f435b9b 100644 (file)
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -271,8 +271,11 @@ static int snd_mpu401_uart_input_open(struct snd_rawmidi_substream *substream)
        int err;
 
        mpu = substream->rmidi->private_data;
-       if (mpu->open_input && (err = mpu->open_input(mpu)) < 0)
-               return err;
+       if (mpu->open_input) {
+               err = mpu->open_input(mpu);
+               if (err < 0)
+                       return err;
+       }
        if (! test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode)) {
                if (snd_mpu401_do_reset(mpu) < 0)
                        goto error_out;
@@ -293,8 +296,11 @@ static int snd_mpu401_uart_output_open(struct snd_rawmidi_substream *substream)
        int err;
 
        mpu = substream->rmidi->private_data;
-       if (mpu->open_output && (err = mpu->open_output(mpu)) < 0)
-               return err;
+       if (mpu->open_output) {
+               err = mpu->open_output(mpu);
+               if (err < 0)
+                       return err;
+       }
        if (! test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode)) {
                if (snd_mpu401_do_reset(mpu) < 0)
                        goto error_out;
@@ -524,8 +530,9 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,
                info_flags |= MPU401_INFO_INPUT | MPU401_INFO_OUTPUT;
        in_enable = (info_flags & MPU401_INFO_INPUT) ? 1 : 0;
        out_enable = (info_flags & MPU401_INFO_OUTPUT) ? 1 : 0;
-       if ((err = snd_rawmidi_new(card, "MPU-401U", device,
-                                  out_enable, in_enable, &rmidi)) < 0)
+       err = snd_rawmidi_new(card, "MPU-401U", device,
+                             out_enable, in_enable, &rmidi);
+       if (err < 0)
                return err;
        mpu = kzalloc(sizeof(*mpu), GFP_KERNEL);
        if (!mpu) {