From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757319AbdKOJ2i (ORCPT ); Wed, 15 Nov 2017 04:28:38 -0500 Received: from mout.web.de ([212.227.17.11]:49352 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755207AbdKOJ2c (ORCPT ); Wed, 15 Nov 2017 04:28:32 -0500 Subject: [PATCH 1/3] ALSA: es1968: Adjust 16 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: <12f2cc3e-7a5b-4406-1286-e5834490c414@users.sourceforge.net> Date: Wed, 15 Nov 2017 10:27:49 +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:ETR48NNsh70Xv6rCBIWtGdArDfsXU6sChvkxY9cBnSqJCZDHeAI 1PQjokXRZXBRnnIezhVg2yp3v9pPdp2wU/VfqpoL51dFVpKoqa829QMjBtgUsyvJ2aN0peQ UOYcFmdtFFHa4VdMjcpuTrRamWvQ5uq04ZqdHZ8jYt53YeBvJ7vjA8Mr60ZeGjz/IBKooQg puA5CNM6tU4fWfyWGjF3w== X-UI-Out-Filterresults: notjunk:1;V01:K0:J6Nl3cn9WXQ=:uTGYhLEqzogxUGB9BZxBLZ iboVO75ZvG9H5qs8TPlPFoa6UIc5jwZNXpdUuMkFfuoV0Hsdi3+xVJ06tvcAx2g+qalx3WJvh 5GNOZbpS/mzrC+sUg3BuPioB3J9vr9/45xf3xCXVxhM6Oj8iN/Nda2YXXppZmwZqlv89XFMJj pFVzqQOboi690+V1+Hd758yaH7Ovsb0UMd6bS8VnsiJpHKMYRnvxmz2cG7vSrQzgDOE/BuPK4 8pcuOVrkefZUDYrx+Jouxjpf76O4WBfNuKtVztUXLDywSCwZZnyShcBDPLJCDsOBjlWYZ7T0B 3BJdaz1kVmVdq7a77le4r5M58g0XXYjfSAayc+BWg8ygIknZYSv5VG17ESjCoP5KllHCJoiEv 2+tFOuY5FA/i6+XnKXw1MN3nO4KEZfeoE7QZ+O6m+JUt+6GC+8SyU0Vt50+YIitNHr1dvlKXl zzzZYzxy+vaYQVk88+p1Q+q75057oFgkPtGLNxovhm/Hc8KI+ohsapFQIdp1gDnVSx62mwfOJ OSaeT3WtaLx+6kg8o8oVRCYt9GtoNZvQfpnS53BXmRH8ywOZRSvChhOovffjpn1nTBAdp/Xxb 2gm8YPuGqxyEC4T4GhOHKfINU8nG7hO9cR+nagKd/bk+qH2u9jAlKUgBqso/086FvMd830ArY 3Lchw76PZjky6UhB2WOC3RGnx2V2nrERebBKPCVoJdzkL1ehzmio0/mK4zaji+m//e4KG7MgU jEf3g0JowKB1+Xr1xByox6D7UlkzcZpb02AJLdxQRDWXYy1TzulL6OmdpSZIV+8imarIiK7jK yt9bN89uDnfOypH5DIXQZJbaY8rN4SNsyac3wrC6iYxrKJ69gY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 14 Nov 2017 22:45:01 +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/es1968.c | 78 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 0b1845ca6005..d68980087f93 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -1620,7 +1620,8 @@ static int snd_es1968_capture_open(struct snd_pcm_substream *substream) es->mode = ESM_MODE_CAPTURE; /* get mixbuffer */ - if ((es->mixbuf = snd_es1968_new_memory(chip, ESM_MIXBUF_SIZE)) == NULL) { + es->mixbuf = snd_es1968_new_memory(chip, ESM_MIXBUF_SIZE); + if (!es->mixbuf) { snd_es1968_free_apu_pair(chip, apu1); snd_es1968_free_apu_pair(chip, apu2); kfree(es); @@ -1717,11 +1718,14 @@ static void es1968_measure_clock(struct es1968 *chip) chip->clock = 48000; /* default clock value */ /* search 2 APUs (although one apu is enough) */ - if ((apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY)) < 0) { + apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY); + if (apu < 0) { dev_err(chip->card->dev, "Hmm, cannot find empty APU pair!?\n"); return; } - if ((memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE)) == NULL) { + + memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE); + if (!memory) { dev_warn(chip->card->dev, "cannot allocate dma buffer - using default clock %d\n", chip->clock); @@ -1813,7 +1817,8 @@ snd_es1968_pcm(struct es1968 *chip, int device) int err; /* get DMA buffer */ - if ((err = snd_es1968_init_dmabuf(chip)) < 0) + err = snd_es1968_init_dmabuf(chip); + if (err < 0) return err; /* set PCMBAR */ @@ -1822,9 +1827,10 @@ snd_es1968_pcm(struct es1968 *chip, int device) wave_set_register(chip, 0x01FE, chip->dma.addr >> 12); wave_set_register(chip, 0x01FF, chip->dma.addr >> 12); - if ((err = snd_pcm_new(chip->card, "ESS Maestro", device, - chip->playback_streams, - chip->capture_streams, &pcm)) < 0) + err = snd_pcm_new(chip->card, "ESS Maestro", device, + chip->playback_streams, + chip->capture_streams, &pcm); + if (err < 0) return err; pcm->private_data = chip; @@ -1973,9 +1979,9 @@ static void es1968_update_hw_volume(struct work_struct *work) static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id) { struct es1968 *chip = dev_id; - u32 event; + u32 event = inb(chip->io_port + 0x1A); - if (!(event = inb(chip->io_port + 0x1A))) + if (!event) return IRQ_NONE; outw(inw(chip->io_port + 4) & 1, chip->io_port + 4); @@ -2030,13 +2036,15 @@ snd_es1968_mixer(struct es1968 *chip) .read = snd_es1968_ac97_read, }; - 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; pbus->no_vra = 1; /* ES1968 doesn't need VRA */ memset(&ac97, 0, sizeof(ac97)); ac97.private_data = chip; - if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97)) < 0) + err = snd_ac97_mixer(pbus, &ac97, &chip->ac97); + if (err < 0) return err; #ifndef CONFIG_SND_ES1968_INPUT @@ -2686,7 +2694,8 @@ static int snd_es1968_create(struct snd_card *card, *chip_ret = NULL; /* enable PCI device */ - if ((err = pci_enable_device(pci)) < 0) + err = pci_enable_device(pci); + if (err < 0) return err; /* check, if we can restrict PCI DMA transfers to 28 bits */ if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 || @@ -2718,7 +2727,8 @@ static int snd_es1968_create(struct snd_card *card, chip->playback_streams = play_streams; chip->capture_streams = capt_streams; - if ((err = pci_request_regions(pci, "ESS Maestro")) < 0) { + err = pci_request_regions(pci, "ESS Maestro"); + if (err < 0) { kfree(chip); pci_disable_device(pci); return err; @@ -2764,7 +2774,8 @@ static int snd_es1968_create(struct snd_card *card, snd_es1968_chip_init(chip); - 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_es1968_free(chip); return err; } @@ -2829,14 +2840,16 @@ static int snd_es1968_probe(struct pci_dev *pci, total_bufsize[dev] = 128; if (total_bufsize[dev] > 4096) total_bufsize[dev] = 4096; - if ((err = snd_es1968_create(card, pci, - total_bufsize[dev] * 1024, /* in bytes */ - pcm_substreams_p[dev], - pcm_substreams_c[dev], - pci_id->driver_data, - use_pm[dev], - radio_nr[dev], - &chip)) < 0) { + + err = snd_es1968_create(card, pci, + total_bufsize[dev] * 1024, /* in bytes */ + pcm_substreams_p[dev], + pcm_substreams_c[dev], + pci_id->driver_data, + use_pm[dev], + radio_nr[dev], + &chip); + if (err < 0) { snd_card_free(card); return err; } @@ -2857,12 +2870,14 @@ static int snd_es1968_probe(struct pci_dev *pci, break; } - if ((err = snd_es1968_pcm(chip, 0)) < 0) { + err = snd_es1968_pcm(chip, 0); + if (err < 0) { snd_card_free(card); return err; } - if ((err = snd_es1968_mixer(chip)) < 0) { + err = snd_es1968_mixer(chip); + if (err < 0) { snd_card_free(card); return err; } @@ -2880,13 +2895,13 @@ static int snd_es1968_probe(struct pci_dev *pci, } } if (enable_mpu[dev]) { - if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, - chip->io_port + ESM_MPU401_PORT, - MPU401_INFO_INTEGRATED | - MPU401_INFO_IRQ_HOOK, - -1, &chip->rmidi)) < 0) { + err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, + chip->io_port + ESM_MPU401_PORT, + MPU401_INFO_INTEGRATED | + MPU401_INFO_IRQ_HOOK, + -1, &chip->rmidi); + if (err < 0) dev_warn(card->dev, "skipping MPU-401 MIDI support..\n"); - } } snd_es1968_create_gameport(chip, dev); @@ -2907,7 +2922,8 @@ static int snd_es1968_probe(struct pci_dev *pci, sprintf(card->longname, "%s at 0x%lx, irq %i", card->shortname, chip->io_port, 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