[PATCH 1/2] ALSA: pcxhr: Adjust six function calls together with a variable assignment

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Thu, 16 Nov 2017 21:50:21 +0100

The script "checkpatch.pl" pointed information out like the following.

ERROR: do not use assignment in if condition

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 sound/pci/pcxhr/pcxhr.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index f9ae72f28ddc..c490d7e57ff7 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1166,9 +1166,10 @@ int pcxhr_create_pcm(struct snd_pcxhr *chip)
        char name[32];
 
        snprintf(name, sizeof(name), "pcxhr %d", chip->chip_idx);
-       if ((err = snd_pcm_new(chip->card, name, 0,
-                              chip->nb_streams_play,
-                              chip->nb_streams_capt, &pcm)) < 0) {
+       err = snd_pcm_new(chip->card, name, 0,
+                         chip->nb_streams_play,
+                         chip->nb_streams_capt, &pcm);
+       if (err < 0) {
                dev_err(chip->card->dev, "cannot create pcm %s\n", name);
                return err;
        }
@@ -1233,7 +1234,8 @@ static int pcxhr_create(struct pcxhr_mgr *mgr,
                        chip->nb_streams_capt = 1;      /* or 1 stereo stream */
        }
 
-       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) {
                pcxhr_chip_free(chip);
                return err;
        }
@@ -1530,7 +1532,8 @@ static int pcxhr_probe(struct pci_dev *pci,
        }
 
        /* enable PCI device */
-       if ((err = pci_enable_device(pci)) < 0)
+       err = pci_enable_device(pci);
+       if (err < 0)
                return err;
        pci_set_master(pci);
 
@@ -1575,7 +1578,8 @@ static int pcxhr_probe(struct pci_dev *pci,
                mgr->granularity = PCXHR_GRANULARITY;
 
        /* resource assignment */
-       if ((err = pci_request_regions(pci, card_name)) < 0) {
+       err = pci_request_regions(pci, card_name);
+       if (err < 0) {
                kfree(mgr);
                pci_disable_device(pci);
                return err;
@@ -1646,7 +1650,8 @@ static int pcxhr_probe(struct pci_dev *pci,
                snprintf(card->longname, sizeof(card->longname),
                         "%s [PCM #%d]", mgr->name, i);
 
-               if ((err = pcxhr_create(mgr, card, i)) < 0) {
+               err = pcxhr_create(mgr, card, i);
+               if (err < 0) {
                        snd_card_free(card);
                        pcxhr_free(mgr);
                        return err;
@@ -1656,7 +1661,8 @@ static int pcxhr_probe(struct pci_dev *pci,
                        /* init proc interface only for chip0 */
                        pcxhr_proc_init(mgr->chip[i]);
 
-               if ((err = snd_card_register(card)) < 0) {
+               err = snd_card_register(card);
+               if (err < 0) {
                        pcxhr_free(mgr);
                        return err;
                }
-- 
2.15.0