From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934946AbdKPV1A (ORCPT ); Thu, 16 Nov 2017 16:27:00 -0500 Received: from mout.web.de ([217.72.192.78]:65456 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751599AbdKPV0v (ORCPT ); Thu, 16 Nov 2017 16:26:51 -0500 Subject: [PATCH 1/2] ALSA: pcxhr: Adjust six function calls together with a variable assignment From: SF Markus Elfring To: alsa-devel@alsa-project.org, Arnd Bergmann , Bhumika Goyal , Jaroslav Kysela , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <41a0e34c-d3b5-c9d9-1827-9977e084bd0f@users.sourceforge.net> Date: Thu, 16 Nov 2017 22:26:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:HJjNIOPdeNPCHJ9bfr9NUfQvrCq8FemCuVOaFuVxWGHLrvjaAX0 hjFgwVvZDlYiVIz5yR7AEa5r3Q/jPRrpVOtvEKrulDpOGgB+UcXF9hEIIEfLJVgffAOslkx lWTnKc7TCR6gVfn1vAH1zgReJfI+IPJP7V3jvxcksyZP6/AVxtlNfhoprZDeJy3mCwIHhVY hhm9PELB51cWe4myB9vbQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:mf1kGTztA08=:9m46vZqfwVuKGF5urvoBsk cTNE3toIiqVQLqgXeEYatdM9F4ZSbxaezdG0Yz3+5XuU3qdUMJWYgYadtd4Jj0FBN5VuotIte etEC3P6VFIgLqy+0vxukT2pvPtm1FHsk/Sb+Ggw9MUco7a+LV3BEsvuxfpdMdwbcL0hcoaLnD YxDthDIEq8KlPRh0Yd/N5DeyidD3p1uoHczOr/x1Y0HhGG1GZBRHwKi7U16Q6WIMMzgdZHIOe 1fgsKzcoZpEqJrKZAihJ1ywbcvtmkHZAWGCGRNad2mz6aZZBfmPIMUss660VAcYNKbqJfmayC 03fsEqMD5qpqxSgQlaSDWjm7GyEiCs/HCeToQCpNcmGtEBJNiVtskYADbSVaUi5Hl7VWhbsqu 2CjttEBvJvUHNBcTKfJ1rvqQeDB0AEm87tx+88sP7iI+LcEwIAJwFtnzriYvFRrosrtVVB3pH lVomc5k/HY/pMmymUQE01G+5fkOXOpCLTw7cVa05XRn5AQI6BUue4kam7OH8zMlmUKV2eNQxd 4S28LPOeMclmOsvmaLJuyj/zsd6ToAsIzNc6hx1wwqfaNWxQGgnXFcCkrfod+fAmwiPhNf6WH dBoNdvx4CooSTYoTjck/LPgtIH1YmHKiiUmim4rALBXYqXGuHNihAxfwC9ziqGeJOBvR1K/Rr mOPDqs/esWhri/jQ4KR3nsEa9PRX68C6/GXHN6uFVEvF/YUjtneB0jYKpPiQv8GdKfYl2NUn6 KXrpZrqE4gK7N4XTK+YGJSBcg+VhoT8G4rytnKZre6Vx1Rs9l0ANpjowPhbwyPUArUfQ9u+cx TPowFcS0B0oEt7BWWepwwPOj3e4mA1G/e4xI6k8lHwCaX+5FdE= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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