From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163865AbdKRUkm (ORCPT ); Sat, 18 Nov 2017 15:40:42 -0500 Received: from mout.web.de ([217.72.192.78]:50666 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752070AbdKRUkd (ORCPT ); Sat, 18 Nov 2017 15:40:33 -0500 Subject: [PATCH 1/2] ALSA: vx222: Adjust ten function calls together with a variable assignment From: SF Markus Elfring To: alsa-devel@alsa-project.org, Bhumika Goyal , Jaroslav Kysela , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <76f53fb4-b7c4-ccd9-58c8-ad478bb3a9b0@users.sourceforge.net> Date: Sat, 18 Nov 2017 21:39:51 +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:8BypKjSLjSSoz8fMoUdPDi/tyEQ1CRIm86Sl1py2dqHIdj/omJl ef/cy9LB9u/yv1RAjYZ60d0bzWhqUjUzcrj3DNb44EgOw0fRgwviIMDi7TsQn5BM6k+qpTI Uvk6x22Xx2ORn2ZPDbFfIq4FFoCkwmXaduhkxQPOrUTfpQhxRf4XNxZN5Lkv+E+XUhPRzTX tUtFPF4RAZeG5ObLvCj7g== X-UI-Out-Filterresults: notjunk:1;V01:K0:7aOuX2ddIiI=:8q5R29Oaq8PBkp2Y+Ux3cu VT7gXprcLr/A/w5Nt9Dh4tIgEDtuRztlmnBmu2vk4h8aiwscz1+2q04l7xmnJ/VZHLfdk8wK9 UyjCNtBCEd5jqmvWJ/GgrID9TkeiJ8IIY+1c+c1DhMPw32opJntxHHF5/1OniA6awZRCUSoQQ dYwsY7YGTFa1ADwdrgVMcDNs3rUYF/PjBbela2gWRyyB1UgX8XR7RWCraaHeLe6raHnQ7JxUw 4SCDo5Zj0m5IT/YP+A0D3mYNulssLX36s1httlUBLMbAcyHZPnPnNzN8VWZkM+jRCDrnT68bP GreLvy2QmhPTaSRvgvNEtNVWzx7xUsIEjzUhAnS37REHqM0eCQoGe+m0fou7YCo3Vno5H1kyY QOiFzyMycJXYHRRM5nUKgbQ8f+lj8NhY8zYLREwArv0kK9NpeDj52Lzz0FZ2SEEW+d6zS5GmZ 9aC+b0rXWKHLS42eNGNaSf4dyue0l9zbjLl6sQob0jbQ8U4DqKQI+4nJjWsverQjL1cBcszXe mdSSHfBK1nwhEaE6qE9gXvUrXcUcU8wmha3OeA83latsicV3zkZgsVbwMFqQcvYRbP3K6hVXb X3ujlnqZ9nHuKs/veYbv30wogt4Ld273hkbTk7hnKVHAftONaQay5BJOqWRlraJonIDy7cpqI F3A9yGX1Oq96u+RKc/CYUqS2VMZlKbQA0a+WyLT++eemwzB0Q7dwLUN2qtACCdMxZDsGBiNxx l52jbEOynxSiLcmeX+62v9WU7DWi5HHrjE1f7RxV3X3iOeno8OhYMpry7gpO/n11luwlOAEAj aCpcLBKbotANpvH29qkFsJYPkG1MhlK1XuxAEAf8pTSXJ9ZYIM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 18 Nov 2017 21:10:37 +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/vx222/vx222.c | 19 +++++++++++++------ sound/pci/vx222/vx222_ops.c | 19 +++++++++++-------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c index 55861849d7df..1f866a810a98 100644 --- a/sound/pci/vx222/vx222.c +++ b/sound/pci/vx222/vx222.c @@ -147,7 +147,8 @@ static int snd_vx222_create(struct snd_card *card, struct pci_dev *pci, struct snd_vx_ops *vx_ops; /* enable PCI device */ - if ((err = pci_enable_device(pci)) < 0) + err = pci_enable_device(pci); + if (err < 0) return err; pci_set_master(pci); @@ -161,7 +162,8 @@ static int snd_vx222_create(struct snd_card *card, struct pci_dev *pci, vx = to_vx222(chip); vx->pci = pci; - if ((err = pci_request_regions(pci, CARD_NAME)) < 0) { + err = pci_request_regions(pci, CARD_NAME); + if (err < 0) { snd_vx222_free(chip); return err; } @@ -177,7 +179,8 @@ static int snd_vx222_create(struct snd_card *card, struct pci_dev *pci, } chip->irq = pci->irq; - 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) { snd_vx222_free(chip); return err; } @@ -220,7 +223,9 @@ static int snd_vx222_probe(struct pci_dev *pci, hw = &vx222_v2_hw; break; } - if ((err = snd_vx222_create(card, pci, hw, &vx)) < 0) { + + err = snd_vx222_create(card, pci, hw, &vx); + if (err < 0) { snd_card_free(card); return err; } @@ -236,12 +241,14 @@ static int snd_vx222_probe(struct pci_dev *pci, vx->core.dev = &pci->dev; #endif - if ((err = snd_vx_setup_firmware(&vx->core)) < 0) { + err = snd_vx_setup_firmware(&vx->core); + if (err < 0) { snd_card_free(card); return err; } - if ((err = snd_card_register(card)) < 0) { + err = snd_card_register(card); + if (err < 0) { snd_card_free(card); return err; } diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c index d4298af6d3ee..4447d7f57dee 100644 --- a/sound/pci/vx222/vx222_ops.c +++ b/sound/pci/vx222/vx222_ops.c @@ -421,11 +421,12 @@ static int vx2_load_dsp(struct vx_core *vx, int index, const struct firmware *ds switch (index) { case 1: /* xilinx image */ - if ((err = vx2_load_xilinx_binary(vx, dsp)) < 0) + err = vx2_load_xilinx_binary(vx, dsp); + if (err < 0) return err; - if ((err = vx2_test_xilinx(vx)) < 0) - return err; - return 0; + + err = vx2_test_xilinx(vx); + return (err < 0) ? err : 0; case 2: /* DSP boot */ return snd_vx_dsp_boot(vx, dsp); @@ -985,12 +986,14 @@ static int vx2_add_mic_controls(struct vx_core *_chip) vx2_set_input_level(chip); /* controls */ - if ((err = snd_ctl_add(_chip->card, snd_ctl_new1(&vx_control_input_level, chip))) < 0) - return err; - 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_input_level, chip)); + if (err < 0) return err; - return 0; + err = snd_ctl_add(_chip->card, + snd_ctl_new1(&vx_control_mic_level, chip)); + return (err < 0) ? err : 0; } -- 2.15.0