From patchwork Mon Nov 13 12:51:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10055645 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B47D60365 for ; Mon, 13 Nov 2017 12:51:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1238D294C1 for ; Mon, 13 Nov 2017 12:51:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05499294C7; Mon, 13 Nov 2017 12:51:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0404294C1 for ; Mon, 13 Nov 2017 12:51:55 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 55C2F267359; Mon, 13 Nov 2017 13:51:54 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 25E08266D86; Mon, 13 Nov 2017 13:51:53 +0100 (CET) Received: from mout.web.de (mout.web.de [217.72.192.78]) by alsa0.perex.cz (Postfix) with ESMTP id 785C2266D86 for ; Mon, 13 Nov 2017 13:51:50 +0100 (CET) Received: from [192.168.1.3] ([92.228.193.202]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LshSX-1fBK4f2S2D-012Jdt; Mon, 13 Nov 2017 13:51:44 +0100 From: SF Markus Elfring To: alsa-devel@alsa-project.org, Bhumika Goyal , Fabian Frederick , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto References: Message-ID: <9b21d539-1545-4b7f-4adb-0aa3d3f43c1d@users.sourceforge.net> Date: Mon, 13 Nov 2017 13:51:43 +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-Language: en-GB X-Provags-ID: V03:K0:K1nwmgz2gvpCpFh46mrLrLNGxUYb99ag5baf/S6M2Wi+nfnnRps v5AKDjvuHtuxNtj3CpGNCFFdSRhj34EvJFEKpQYe93zfiirPvykQ1A2wpkU7DZ1if/H1BoZ Dy/GAZQHx0kgdZhprQXGzzzNHEdDHz/oOi279rGywGUl9zXbnOZpWv1xVv1pSCY10xhprPf lr7iuGKHqkSPgzwsPqC1w== X-UI-Out-Filterresults: notjunk:1; V01:K0:dXApju0XG1Q=:aLx6DaDugQzylWx3jXq1x5 uwW8yTTlJ+oGfPGqxRKIxwjatMxk7YXzxduP3WdS4XPJjY0K5TN/Z14454F/fEJwyo3kYw9Il 5YOj/A0cDq5OhckKsNv9rXXyoi4pm902o5+qKKVtZlqr6tJsXa9dY4KaxQ8ufg5CX6Rijo362 AC4eEKjHV3EJF8W1dAdYwBjTJ1ffu5+DlCUqV1h1PychXXLHrZbaQrJVVz2xbOV+efULaBRIB G1TNhbanIVvGS2jYcx/7fLnB0QhVEE/3rRnp2Lqm9yEggHzKJW7RX7M271s2GqBoo8KQdtyOF ZNokXzvl66bGUfcqIQ9rkrB7zoPiJZUCy03oLgVBUiA2KYI3mbn4YntDanzvOwWRCo2RgqFCV 2VZyaMrXmG9pwSWyr9MHf5WBH+4uJInsvB6lWEyEkW2oPxeg6uDbeUPGLkf+L+1eqbtAz+gDH Br6U+ifAO7AaKxLiChNGZpsFtEyZRiyg3rE+ix5CvOh3uI4UP7WT9tvycCJPAlhEFFWIeUwT6 OT2QF4WSs4eCmhHsp3tCpuxv2D+fvANo/HYqjsW03mhiQkAOd3Whc8ou6id0yrfa7nRqGvwuY 78vRSlGkDb+aW+5R2jU31ZzOoXzyASyhdb+ixr5FSkmGkMP/EUDbHI/8jeVpIRt+I1XaHq17l spm5aCpouu2Gn8Qacw1/sNe4d2s0yQSeZd5wtjJSoZseRzKJKaqoyb0c4+viRQknoRrUmxBGP ELdNQd3c4z863yRqf1/+dfQBPXFEpk4BuzF1Qem1YtA2iHHlpVI6rF7muP7nNvWhmlpLpXN9y cao3AAkWOzUhNUMHy8JLTmgT7KQNT5wOCMY5dgYEG/jgkUfXfI= Cc: kernel-janitors@vger.kernel.org, LKML Subject: [alsa-devel] [PATCH 1/3] ALSA: cs4281: Adjust 18 function calls together with a variable assignment X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Mon, 13 Nov 2017 12:52:53 +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/cs4281.c | 59 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index ec4247638fa1..cf0bcab2a36b 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c @@ -1102,23 +1102,31 @@ static int snd_cs4281_mixer(struct cs4281 *chip) .read = snd_cs4281_ac97_read, }; - if ((err = snd_ac97_bus(card, 0, &ops, chip, &chip->ac97_bus)) < 0) + err = snd_ac97_bus(card, 0, &ops, chip, &chip->ac97_bus); + if (err < 0) return err; chip->ac97_bus->private_free = snd_cs4281_mixer_free_ac97_bus; memset(&ac97, 0, sizeof(ac97)); ac97.private_data = chip; ac97.private_free = snd_cs4281_mixer_free_ac97; - if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97)) < 0) + err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97); + if (err < 0) return err; if (chip->dual_codec) { ac97.num = 1; - if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_secondary)) < 0) + err = snd_ac97_mixer(chip->ac97_bus, &ac97, + &chip->ac97_secondary); + if (err < 0) return err; } - if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4281_fm_vol, chip))) < 0) + + err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4281_fm_vol, chip)); + if (err < 0) return err; - if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4281_pcm_vol, chip))) < 0) + + err = snd_ctl_add(card, snd_ctl_new1(&snd_cs4281_pcm_vol, chip)); + if (err < 0) return err; return 0; } @@ -1346,7 +1354,8 @@ static int snd_cs4281_create(struct snd_card *card, }; *rchip = NULL; - if ((err = pci_enable_device(pci)) < 0) + err = pci_enable_device(pci); + if (err < 0) return err; chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (chip == NULL) { @@ -1364,7 +1373,8 @@ static int snd_cs4281_create(struct snd_card *card, } chip->dual_codec = dual_codec; - if ((err = pci_request_regions(pci, "CS4281")) < 0) { + err = pci_request_regions(pci, "CS4281"); + if (err < 0) { kfree(chip); pci_disable_device(pci); return err; @@ -1393,7 +1403,8 @@ static int snd_cs4281_create(struct snd_card *card, return tmp; } - 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_cs4281_free(chip); return err; } @@ -1432,12 +1443,15 @@ static int snd_cs4281_chip_init(struct cs4281 *chip) * space between 0e4h and 0ffh to be written. */ snd_cs4281_pokeBA0(chip, BA0_CWPR, 0x4281); - if ((tmp = snd_cs4281_peekBA0(chip, BA0_SERC1)) != (BA0_SERC1_SO1EN | BA0_SERC1_AC97)) { + tmp = snd_cs4281_peekBA0(chip, BA0_SERC1); + if (tmp != (BA0_SERC1_SO1EN | BA0_SERC1_AC97)) { dev_err(chip->card->dev, "SERC1 AC'97 check failed (0x%x)\n", tmp); return -EIO; } - if ((tmp = snd_cs4281_peekBA0(chip, BA0_SERC2)) != (BA0_SERC2_SI1EN | BA0_SERC2_AC97)) { + + tmp = snd_cs4281_peekBA0(chip, BA0_SERC2); + if (tmp != (BA0_SERC2_SI1EN | BA0_SERC2_AC97)) { dev_err(chip->card->dev, "SERC2 AC'97 check failed (0x%x)\n", tmp); return -EIO; @@ -1784,9 +1798,9 @@ static const struct snd_rawmidi_ops snd_cs4281_midi_input = static int snd_cs4281_midi(struct cs4281 *chip, int device) { struct snd_rawmidi *rmidi; - int err; + int err = snd_rawmidi_new(chip->card, "CS4281", device, 1, 1, &rmidi); - if ((err = snd_rawmidi_new(chip->card, "CS4281", device, 1, 1, &rmidi)) < 0) + if (err < 0) return err; strcpy(rmidi->name, "CS4281"); snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_cs4281_midi_output); @@ -1919,32 +1933,38 @@ static int snd_cs4281_probe(struct pci_dev *pci, if (err < 0) return err; - if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) { + err = snd_cs4281_create(card, pci, &chip, dual_codec[dev]); + if (err < 0) { snd_card_free(card); return err; } card->private_data = chip; - if ((err = snd_cs4281_mixer(chip)) < 0) { + err = snd_cs4281_mixer(chip); + if (err < 0) { snd_card_free(card); return err; } - if ((err = snd_cs4281_pcm(chip, 0)) < 0) { + err = snd_cs4281_pcm(chip, 0); + if (err < 0) { snd_card_free(card); return err; } - if ((err = snd_cs4281_midi(chip, 0)) < 0) { + err = snd_cs4281_midi(chip, 0); + if (err < 0) { snd_card_free(card); return err; } - if ((err = snd_opl3_new(card, OPL3_HW_OPL3_CS4281, &opl3)) < 0) { + err = snd_opl3_new(card, OPL3_HW_OPL3_CS4281, &opl3); + if (err < 0) { snd_card_free(card); return err; } opl3->private_data = chip; opl3->command = snd_cs4281_opl3_command; snd_opl3_init(opl3); - if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { + err = snd_opl3_hwdep_new(opl3, 0, 1, NULL); + if (err < 0) { snd_card_free(card); return err; } @@ -1956,7 +1976,8 @@ static int snd_cs4281_probe(struct pci_dev *pci, chip->ba0_addr, chip->irq); - if ((err = snd_card_register(card)) < 0) { + err = snd_card_register(card); + if (err < 0) { snd_card_free(card); return err; }