From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935014AbdKOVGf (ORCPT ); Wed, 15 Nov 2017 16:06:35 -0500 Received: from mout.web.de ([212.227.17.11]:56418 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756109AbdKOVG1 (ORCPT ); Wed, 15 Nov 2017 16:06:27 -0500 Subject: [PATCH 1/2] ALSA: intel8x0m: Adjust 12 function calls together with a variable assignment From: SF Markus Elfring To: alsa-devel@alsa-project.org, Arvind Yadav , Bhumika Goyal , Jaroslav Kysela , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <4b5be7ac-8c5b-0b3d-ee9f-ae749cca4ddf@users.sourceforge.net> Date: Wed, 15 Nov 2017 22:05:13 +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:2T5bttuKYDgDzPAogLob4/Su09gT8n+Z1D+7ibJ4r0ZYHtrws9y JLMgE1vv8QL+geoC9NfD3Zz97it0KYHvfC1MeiWoOh0GpvObfGJVuRfC57eQhmrEJ5jk3l3 eKjij1Aqrg9ezDpDqeShjMqoKNB45rFmhlDSN6M1oMYXqZ3mbSTQwVkhu4lppAXlmdEhqSH 0YAN/ziZK5v2Amry6JZYA== X-UI-Out-Filterresults: notjunk:1;V01:K0:E9V0NSOlAYs=:zFzhvqcSejaDJRlemsy1vp uDUWC9MArf8uSXzc5CVC5gLOn4ZL2mbZ21oDkd53znkLko890KvQ9zHyYySQCuyDQXqrOHNzs auMMbWhSzKrI8UlyESLjXlXlegezbCgF8sWFTVsS8ao/XsLKVoaFR2cgHmpM8wrrSu9+P1yG9 /u2ajn0RhHV2sSnLbGWnZtt6CYjRr+oMTfO/ar5UD60DZAX7UdWIotwjPaxZLEtZTBwuBimC9 ym2A7HSd6GciiAOh35jyKGBtNPiy336rVKYSCi7cMyxKBwgFn1a5p5W7lSr+RG39+lfGfenwh XqYLTLsxF8hw0Nx0Mhhb5puS9tKhBvydleW53rRs3UtS87pC1ko7cgW9IJv6tfF3Y5n3Ld/gd P5WnhD2MS15/cqrixNhP4WEklAMz7IeuvZEiPPYhcrVm/h72DAwfo0ZpGOKNC9UADOmTVreZH CtRS0msP9RYlvEuVmtGxRZ5i2rzKi+donrmIGSp11WoF/lW1ZyRsndn3JgN3fGG2Yp+agskmM MK9PFNc8vuzliE5AgMY5AIgXK5DIPYH8C+URoqimkV8+/ctR3/eO5Aimgq4hQl0ZLyMBaUS2c OZ9LCnkhv6QDJyxBDe4CG2sy84wxm91eOQLuefWTowyigEbm3cFL7Gp/QQgFnnTjRvyEodfw3 tGsJwI0n/25aUVoWKcZ4BZdxztVXs4U8KdEUS999wV2hkEL/5JLPd+7RTkbs9R7yDoL9w1P9V tEqygNUiLCrOxuiYX3cHRFbPVfUOKCQKc8mxgqkpe/Qdot4bIem3BMlYulWbSERaNkJ3a8H2c /y0x712/FOPcflWY2eU7PdfTAHYdgsi+OawAszVyfEJSN5TL5w= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 15 Nov 2017 21:34:23 +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/intel8x0m.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 3a4769a97d29..ab798533a6bc 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -372,7 +372,8 @@ static unsigned short snd_intel8x0m_codec_read(struct snd_ac97 *ac97, res = 0xffff; } else { res = iagetword(chip, reg + ac97->num * 0x80); - if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) { + tmp = igetdword(chip, ICHREG(GLOB_STA)); + if (tmp & ICH_RCS) { /* reset RCS and preserve other R/WC bits */ iputdword(chip, ICHREG(GLOB_STA), tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); @@ -847,7 +848,8 @@ static int snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock) glob_sta = igetdword(chip, ICHREG(GLOB_STA)); - if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus)) < 0) + err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus); + if (err < 0) goto __err; pbus->private_free = snd_intel8x0m_mixer_free_ac97_bus; if (ac97_clock >= 8000 && ac97_clock <= 48000) @@ -856,7 +858,8 @@ static int snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock) ac97.pci = chip->pci; ac97.num = glob_sta & ICH_SCR ? 1 : 0; - if ((err = snd_ac97_mixer(pbus, &ac97, &x97)) < 0) { + err = snd_ac97_mixer(pbus, &ac97, &x97); + if (err < 0) { dev_err(chip->card->dev, "Unable to initialize codec #%d\n", ac97.num); if (ac97.num == 0) @@ -974,7 +977,8 @@ static int snd_intel8x0m_chip_init(struct intel8x0m *chip, int probing) unsigned int i; int err; - if ((err = snd_intel8x0m_ich_chip_init(chip, probing)) < 0) + err = snd_intel8x0m_ich_chip_init(chip, probing); + if (err < 0) return err; iagetword(chip, 0); /* clear semaphore flag */ @@ -1125,7 +1129,8 @@ static int snd_intel8x0m_create(struct snd_card *card, *r_intel8x0m = NULL; - if ((err = pci_enable_device(pci)) < 0) + err = pci_enable_device(pci); + if (err < 0) return err; chip = kzalloc(sizeof(*chip), GFP_KERNEL); @@ -1139,7 +1144,8 @@ static int snd_intel8x0m_create(struct snd_card *card, chip->pci = pci; chip->irq = -1; - if ((err = pci_request_regions(pci, card->shortname)) < 0) { + err = pci_request_regions(pci, card->shortname); + if (err < 0) { kfree(chip); pci_disable_device(pci); return err; @@ -1224,12 +1230,14 @@ static int snd_intel8x0m_create(struct snd_card *card, chip->int_sta_reg = ICH_REG_GLOB_STA; chip->int_sta_mask = int_sta_masks; - if ((err = snd_intel8x0m_chip_init(chip, 1)) < 0) { + err = snd_intel8x0m_chip_init(chip, 1); + if (err < 0) { snd_intel8x0m_free(chip); return err; } - 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_intel8x0m_free(chip); return err; } @@ -1286,17 +1294,20 @@ static int snd_intel8x0m_probe(struct pci_dev *pci, } strcat(card->shortname," Modem"); - if ((err = snd_intel8x0m_create(card, pci, pci_id->driver_data, &chip)) < 0) { + err = snd_intel8x0m_create(card, pci, pci_id->driver_data, &chip); + if (err < 0) { snd_card_free(card); return err; } card->private_data = chip; - if ((err = snd_intel8x0m_mixer(chip, ac97_clock)) < 0) { + err = snd_intel8x0m_mixer(chip, ac97_clock); + if (err < 0) { snd_card_free(card); return err; } - if ((err = snd_intel8x0m_pcm(chip)) < 0) { + err = snd_intel8x0m_pcm(chip); + if (err < 0) { snd_card_free(card); return err; } @@ -1306,7 +1317,8 @@ static int snd_intel8x0m_probe(struct pci_dev *pci, sprintf(card->longname, "%s at irq %i", card->shortname, 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