linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: alsa-devel@alsa-project.org,
	Arvind Yadav <arvind.yadav.cs@gmail.com>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	Takashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 1/2] ALSA: nm256: Adjust five function calls together with a variable assignment
Date: Thu, 16 Nov 2017 18:07:27 +0100	[thread overview]
Message-ID: <60be8c64-bbd1-51b7-4ada-60a2f926bf91@users.sourceforge.net> (raw)
In-Reply-To: <d98a2685-ddf9-1cba-839a-d12c5ff8d3ba@users.sourceforge.net>

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 16 Nov 2017 17:37:26 +0100

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

ERROR: do not use assignment in if condition

Thus fix affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 sound/pci/nm256/nm256.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index b97f4ea6b56c..35ce5b3fd81a 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -1334,7 +1334,8 @@ snd_nm256_mixer(struct nm256 *chip)
 	if (! chip->ac97_regs)
 		return -ENOMEM;
 
-	if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
+	err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus);
+	if (err < 0)
 		return err;
 
 	memset(&ac97, 0, sizeof(ac97));
@@ -1493,7 +1494,8 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
 
 	*chip_ret = NULL;
 
-	if ((err = pci_enable_device(pci)) < 0)
+	err = pci_enable_device(pci);
+	if (err < 0)
 		return err;
 
 	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
@@ -1585,7 +1587,8 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
 		chip->buffer_end = buffer_top;
 	else {
 		/* get buffer end pointer from signature */
-		if ((err = snd_nm256_peek_for_sig(chip)) < 0)
+		err = snd_nm256_peek_for_sig(chip);
+		if (err < 0)
 			goto __error;
 	}
 
@@ -1635,7 +1638,8 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
 
 	// pci_set_master(pci); /* needed? */
 	
-	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 __error;
 
 	*chip_ret = chip;
@@ -1717,7 +1721,9 @@ static int snd_nm256_probe(struct pci_dev *pci,
 		capture_bufsize = 4;
 	if (capture_bufsize > 128)
 		capture_bufsize = 128;
-	if ((err = snd_nm256_create(card, pci, &chip)) < 0) {
+
+	err = snd_nm256_create(card, pci, &chip);
+	if (err < 0) {
 		snd_card_free(card);
 		return err;
 	}
@@ -1744,7 +1750,8 @@ static int snd_nm256_probe(struct pci_dev *pci,
 		card->shortname,
 		chip->buffer_addr, chip->cport_addr, chip->irq);
 
-	if ((err = snd_card_register(card)) < 0) {
+	err = snd_card_register(card);
+	if (err < 0) {
 		snd_card_free(card);
 		return err;
 	}
-- 
2.15.0

  reply	other threads:[~2017-11-16 17:08 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-16 17:05 [PATCH 0/2] ALSA: nm256: Fine-tuning for three function implementations SF Markus Elfring
2017-11-16 17:07 ` SF Markus Elfring [this message]
2017-11-16 17:08 ` [PATCH 2/2] ALSA: nm256: Use common error handling code in snd_nm256_probe() SF Markus Elfring
2017-11-16 17:15 ` [PATCH 0/2] ALSA: nm256: Fine-tuning for three function implementations Takashi Iwai
2017-11-16 17:48   ` SF Markus Elfring
2017-11-16 18:54     ` Takashi Iwai
2017-11-16 19:30       ` SF Markus Elfring
2017-11-28  7:46         ` Takashi Iwai
2017-11-28  8:19           ` SF Markus Elfring
2017-11-28  9:10             ` Takashi Iwai
2017-11-28  9:50               ` SF Markus Elfring
2017-11-28 11:37                 ` Takashi Iwai
2017-11-28 12:33                   ` SF Markus Elfring
2017-11-28 12:46                     ` Takashi Iwai
2017-11-28 13:00                       ` SF Markus Elfring
2017-11-28 13:06                         ` Takashi Iwai
2017-11-28 13:17                           ` SF Markus Elfring
2017-11-28 13:38                             ` Takashi Iwai
2017-11-28 14:19                               ` SF Markus Elfring
2017-11-28 14:27                                 ` Takashi Iwai
2017-11-28 14:33                                   ` SF Markus Elfring
2017-11-28 14:38                                     ` Takashi Iwai
2017-11-28 14:44                                       ` SF Markus Elfring
2017-11-28 14:53                                         ` Takashi Iwai
2017-11-28 15:01                                           ` SF Markus Elfring
2017-11-28 15:21                                             ` Takashi Iwai
2017-11-28 16:15                                               ` SF Markus Elfring
2017-11-28 16:27                                                 ` Takashi Iwai
2017-11-28 16:40                                                   ` SF Markus Elfring
2017-11-28 16:44                                                     ` Takashi Iwai
2017-11-28 17:15                                                       ` SF Markus Elfring
2017-11-28 18:35                                                         ` Takashi Iwai
2017-11-28 19:08                                                           ` SF Markus Elfring
2017-11-28 19:43                                                             ` Takashi Iwai
2017-11-28 19:48                                                               ` SF Markus Elfring
2017-11-28 19:54                                                                 ` Takashi Iwai
2017-11-28 19:57                                                                   ` SF Markus Elfring
2017-11-28 20:00                                                                     ` Takashi Iwai
2017-11-28 20:18                                                                       ` SF Markus Elfring
2017-11-28 20:25                                                                         ` Takashi Iwai
2017-11-28 20:32                                                                           ` SF Markus Elfring
2017-11-29 10:34               ` SF Markus Elfring
2017-11-28 12:33             ` [alsa-devel] " Ondrej Zary
2017-11-28 13:10               ` SF Markus Elfring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=60be8c64-bbd1-51b7-4ada-60a2f926bf91@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=alsa-devel@alsa-project.org \
    --cc=arvind.yadav.cs@gmail.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=o-takashi@sakamocchi.jp \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).