From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753194AbdKKLLg (ORCPT ); Sat, 11 Nov 2017 06:11:36 -0500 Received: from mout.web.de ([212.227.15.4]:56840 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751069AbdKKLLe (ORCPT ); Sat, 11 Nov 2017 06:11:34 -0500 Subject: [PATCH 1/3] ALSA: rawmidi: Adjust seven function calls together with a variable assignment From: SF Markus Elfring To: alsa-devel@alsa-project.org, Fabian Frederick , Ingo Molnar , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <11ba4e92-d71a-b8a9-08ff-b2d26a4ba606@users.sourceforge.net> Date: Sat, 11 Nov 2017 12:11:14 +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:uOozI2KVd6ONuPv2KX4EvENJ3PTtrsVRnPlR4UROSfs+QsYfOZU 4h1ECj+CxRX2dr+gEk46KWyJ4DRvAbnsAJFaodt+iMHh7+YT9VEWCw4b60+LXCEa+m76haX MKN+ETQaObjYa2LmEWYShBWJ8+WA3A1K1uRTgt+nXtPgip92yzXWplyXlsVUCgzm3tsMT3I 8o+6Rg5jN6DnHGvBtDkOw== X-UI-Out-Filterresults: notjunk:1;V01:K0:aUEtXhzHB+4=:YRgoC/T51v2Yj0fN7HtWj9 0myE2CJyBqCbNoKUkXuLzgp73dIpbfYkxvhyIZ5CnzVTsJPU4XagxhfoMUJHwIo2DnmllcmdT M/RkDP/o2EdFnzrzJ+3CsTzV4u7ocGgN/wIDEiIeC0rLti1ThB1j77DcntnrorxpxLumechD+ th4OR8wbHannab7ov3B4dO1ayoUEEZz1csom7dvYL0uqAWoRnkUbjVG0h6Bg05QUrZ3SoNz3D 5lHOkHQDlFNNN5lswWL4Al5E0qmK8bKFHjBlW1MQob0SuGVn28rrrYgZNwkJeBnbHRcBY+ALi JZBh7vkzLhQALUKAEMWoLte4mdpEk4tO8+P51YSobFpwBvuBwZnuOGxm3NqgS9gMfyVypHPkF XgVMa0+SeS//eScZESAWoO6kFdbgIvnmuJD0LvXp7VHk+x7AgaiCuPB782+z7w9Ix61vQxtqW pxfBi8AUwek2XYruFXlDt1FyT7ocN2jMFTF2KwklqL+gJZsmnNWw5qDwdFUsov78C1ZweWPAa uEFMtpV5Rs3a66AiGE3w8nFION8gTjxxcr0fgOcJeX/qGcWJUtzLLDpxU7FvVNp55BXtubRe/ QnZQZv/XLGatdeJ05u0DGQOotFgZXvXwH5rPuuXmcI6cYNDgohT7NM9ZLR+gsmsN6KMncce2X qnppyrUIXuGwRX84W/P1hmD+dGvBsOsNRqU1h1f5k0CmbbXvE4LYK46EAfUF5joaXXGT5ks80 7V2k4QYJEBnDoS3wamqim2e1AuJv9FUceTCX5brs3xg0QngUKOZ/smBzPK5dP3Mv8qYa1fSL2 PjhLQS9Wtxed1HK3/6tIocVKegAvZkmOMox7BFQpEL3FXnEwuY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 11 Nov 2017 11:22:28 +0100 The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix affected source code places. Signed-off-by: Markus Elfring --- sound/core/rawmidi.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index b3b353d72527..c17f173150e9 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -109,9 +109,10 @@ static void snd_rawmidi_input_event_work(struct work_struct *work) static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream) { - struct snd_rawmidi_runtime *runtime; + struct snd_rawmidi_runtime *runtime = kzalloc(sizeof(*runtime), + GFP_KERNEL); - if ((runtime = kzalloc(sizeof(*runtime), GFP_KERNEL)) == NULL) + if (!runtime) return -ENOMEM; runtime->substream = substream; spin_lock_init(&runtime->lock); @@ -124,7 +125,9 @@ static int snd_rawmidi_runtime_create(struct snd_rawmidi_substream *substream) runtime->avail = 0; else runtime->avail = runtime->buffer_size; - if ((runtime->buffer = kmalloc(runtime->buffer_size, GFP_KERNEL)) == NULL) { + + runtime->buffer = kmalloc(runtime->buffer_size, GFP_KERNEL); + if (!runtime->buffer) { kfree(runtime); return -ENOMEM; } @@ -571,8 +574,9 @@ static int snd_rawmidi_info_user(struct snd_rawmidi_substream *substream, struct snd_rawmidi_info __user * _info) { struct snd_rawmidi_info info; - int err; - if ((err = snd_rawmidi_info(substream, &info)) < 0) + int err = snd_rawmidi_info(substream, &info); + + if (err < 0) return err; if (copy_to_user(_info, &info, sizeof(struct snd_rawmidi_info))) return -EFAULT; @@ -616,7 +620,8 @@ static int snd_rawmidi_info_select_user(struct snd_card *card, return -EFAULT; if (get_user(info.subdevice, &_info->subdevice)) return -EFAULT; - if ((err = snd_rawmidi_info_select(card, &info)) < 0) + err = snd_rawmidi_info_select(card, &info); + if (err < 0) return err; if (copy_to_user(_info, &info, sizeof(struct snd_rawmidi_info))) return -EFAULT; @@ -1549,21 +1554,30 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int device, rmidi->dev.release = release_rawmidi_device; dev_set_name(&rmidi->dev, "midiC%iD%i", card->number, device); - if ((err = snd_rawmidi_alloc_substreams(rmidi, - &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT], - SNDRV_RAWMIDI_STREAM_INPUT, - input_count)) < 0) { + err = + snd_rawmidi_alloc_substreams(rmidi, + &rmidi + ->streams[SNDRV_RAWMIDI_STREAM_INPUT], + SNDRV_RAWMIDI_STREAM_INPUT, + input_count); + if (err < 0) { snd_rawmidi_free(rmidi); return err; } - if ((err = snd_rawmidi_alloc_substreams(rmidi, - &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT], - SNDRV_RAWMIDI_STREAM_OUTPUT, - output_count)) < 0) { + + err = + snd_rawmidi_alloc_substreams(rmidi, + &rmidi + ->streams[SNDRV_RAWMIDI_STREAM_OUTPUT], + SNDRV_RAWMIDI_STREAM_OUTPUT, + output_count); + if (err < 0) { snd_rawmidi_free(rmidi); return err; } - if ((err = snd_device_new(card, SNDRV_DEV_RAWMIDI, rmidi, &ops)) < 0) { + + err = snd_device_new(card, SNDRV_DEV_RAWMIDI, rmidi, &ops); + if (err < 0) { snd_rawmidi_free(rmidi); return err; } -- 2.15.0