From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753784AbdKKLOH (ORCPT ); Sat, 11 Nov 2017 06:14:07 -0500 Received: from mout.web.de ([212.227.15.3]:62369 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751069AbdKKLOF (ORCPT ); Sat, 11 Nov 2017 06:14:05 -0500 Subject: [PATCH 3/3] ALSA: rawmidi: Adjust 21 checks for null pointers 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: <51addc0f-81fe-1e55-347a-807b960c5430@users.sourceforge.net> Date: Sat, 11 Nov 2017 12:13:19 +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:kea+nTppsOOiPrHjNidx73uW4vLAVplYEjUtXoPjhhEGwdMoGIX RScDe1aOLZ2fGIeQvG7qkgVO+VpgHiJAGWOJMplFfhLzkVj9n0bo4w00IuB30dyUkLrvCN+ MaWJg386muBOJPvqlcgcLLKj1vU9SDRhEGhHS0IRwa8AHInJLuN6LIc4ZP+0FLgJLyXISFu 4+lncpWlsi2lTVIhsc0+w== X-UI-Out-Filterresults: notjunk:1;V01:K0:uRfp3m/cxA0=:78gYju0QqdefNJWppm77H7 aYREHRPNx8VkqbSV4NMz2hwilsOXdvUjpsFgNug+X4NGmv4vTS/jZzf9VOqDJhbs4le/AUaox 1f7QLqCEk1L9IrUajAFHL8PiYCQlGwWHLn4Mw521FzmBAfHASlUGwhR87Pl12zD9SbatHPaCC CfHqP89+4mMGMVzzVqzwhCqCHvv9tHbAuAD82qVsT+I0vL5Ml+8UIaZ4jFDiAJ6b8mWr1ZcBH Xezlk5UyMx9PZLhJL9+PDClHp+dEemn9NNMDy/JgORX4ZjPgnQ/v4QIrUBAp2qBV5/m2PRrAQ kmzvOJ9WqI24kc7MuBBY+l3SdxWe6Vn8sD6eo61bGBen0vB/6PQ8f7qM3bnW4eL2DhMop30k4 ul7ueglJBT7KuPkprlFH/ZWcyYfNFzYdZL2rNDFrHgs6ICMXORVz0DjXWxXGmD0ouAP5DIqLq 2PoZzjJaIqbOThQaLaP8HN5ri0VD55rpR/4+Qmrjq7F/1Oit053244+rZ1jtSgf4aq2lfejXS 24ukSWqhUGwcpWklQzpsjyWHsfoTvzg+/5eYFxDxdICH8icRwco57QAzVBJ8vA7D+tzbcq8mS dQFjm37NonwKcrGZDbkzAA2hlytSi3rXvYVbwwEZsO/h8s0Yc5yvRaRowE382ZIjhX42n6LNv ZbzY/8xGEOnRGuvwMcznRcEkXwimEIUfSNhm8/4ooauk3FwSMt0a5DIKnkDeIlaF3sJ6Sk+F5 65qRkHq9qRJXKFdKHgznNZcpxS9pwVhwyCqLoGU+6d6pwORYBjpvDzTxS7/ETACdnazYmYi7j 9V8Y3EEEP40ioNTc10Q7hzigIKM2HvGh8FqOGFEeSsZwSbXZEQ= 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:48:25 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written … Thus fix the affected source code places. Signed-off-by: Markus Elfring --- sound/core/rawmidi.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index 34686000ecce..1934de257a1e 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -343,7 +343,7 @@ int snd_rawmidi_kernel_open(struct snd_card *card, int device, int subdevice, mutex_lock(®ister_mutex); rmidi = snd_rawmidi_search(card, device); - if (rmidi == NULL) { + if (!rmidi) { mutex_unlock(®ister_mutex); return -ENODEV; } @@ -391,7 +391,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) } else return -ENXIO; - if (rmidi == NULL) + if (!rmidi) return -ENODEV; if (!try_module_get(rmidi->card->module)) { @@ -408,7 +408,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) if ((file->f_flags & O_APPEND) || maj == SOUND_MAJOR) /* OSS emul? */ fflags |= SNDRV_RAWMIDI_LFLG_APPEND; rawmidi_file = kmalloc(sizeof(*rawmidi_file), GFP_KERNEL); - if (rawmidi_file == NULL) { + if (!rawmidi_file) { err = -ENOMEM; goto __error; } @@ -552,7 +552,7 @@ static int snd_rawmidi_info(struct snd_rawmidi_substream *substream, { struct snd_rawmidi *rmidi; - if (substream == NULL) + if (!substream) return -ENODEV; rmidi = substream->rmidi; memset(info, 0, sizeof(*info)); @@ -745,11 +745,11 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long return -EFAULT; switch (params.stream) { case SNDRV_RAWMIDI_STREAM_OUTPUT: - if (rfile->output == NULL) + if (!rfile->output) return -EINVAL; return snd_rawmidi_output_params(rfile->output, ¶ms); case SNDRV_RAWMIDI_STREAM_INPUT: - if (rfile->input == NULL) + if (!rfile->input) return -EINVAL; return snd_rawmidi_input_params(rfile->input, ¶ms); default: @@ -764,12 +764,12 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long return -EFAULT; switch (status.stream) { case SNDRV_RAWMIDI_STREAM_OUTPUT: - if (rfile->output == NULL) + if (!rfile->output) return -EINVAL; err = snd_rawmidi_output_status(rfile->output, &status); break; case SNDRV_RAWMIDI_STREAM_INPUT: - if (rfile->input == NULL) + if (!rfile->input) return -EINVAL; err = snd_rawmidi_input_status(rfile->input, &status); break; @@ -789,7 +789,7 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long return -EFAULT; switch (val) { case SNDRV_RAWMIDI_STREAM_OUTPUT: - if (rfile->output == NULL) + if (!rfile->output) return -EINVAL; return snd_rawmidi_drop_output(rfile->output); default: @@ -803,11 +803,11 @@ static long snd_rawmidi_ioctl(struct file *file, unsigned int cmd, unsigned long return -EFAULT; switch (val) { case SNDRV_RAWMIDI_STREAM_OUTPUT: - if (rfile->output == NULL) + if (!rfile->output) return -EINVAL; return snd_rawmidi_drain_output(rfile->output); case SNDRV_RAWMIDI_STREAM_INPUT: - if (rfile->input == NULL) + if (!rfile->input) return -EINVAL; return snd_rawmidi_drain_input(rfile->input); default: @@ -885,7 +885,7 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream, if (!substream->opened) return -EBADFD; - if (runtime->buffer == NULL) { + if (!runtime->buffer) { rmidi_dbg(substream->rmidi, "snd_rawmidi_receive: input is not active!!!\n"); return -EINVAL; @@ -999,7 +999,7 @@ static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t coun rfile = file->private_data; substream = rfile->input; - if (substream == NULL) + if (!substream) return -EIO; runtime = substream->runtime; snd_rawmidi_input_trigger(substream, 1); @@ -1052,7 +1052,7 @@ int snd_rawmidi_transmit_empty(struct snd_rawmidi_substream *substream) int result; unsigned long flags; - if (runtime->buffer == NULL) { + if (!runtime->buffer) { rmidi_dbg(substream->rmidi, "snd_rawmidi_transmit_empty: output is not active!!!\n"); return 1; @@ -1078,7 +1078,7 @@ int __snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream, int result, count1; struct snd_rawmidi_runtime *runtime = substream->runtime; - if (runtime->buffer == NULL) { + if (!runtime->buffer) { rmidi_dbg(substream->rmidi, "snd_rawmidi_transmit_peek: output is not active!!!\n"); return -EINVAL; @@ -1151,7 +1151,7 @@ int __snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int coun { struct snd_rawmidi_runtime *runtime = substream->runtime; - if (runtime->buffer == NULL) { + if (!runtime->buffer) { rmidi_dbg(substream->rmidi, "snd_rawmidi_transmit_ack: output is not active!!!\n"); return -EINVAL; @@ -1369,21 +1369,21 @@ static unsigned int snd_rawmidi_poll(struct file *file, poll_table * wait) unsigned int mask; rfile = file->private_data; - if (rfile->input != NULL) { + if (rfile->input) { runtime = rfile->input->runtime; snd_rawmidi_input_trigger(rfile->input, 1); poll_wait(file, &runtime->sleep, wait); } - if (rfile->output != NULL) { + if (rfile->output) { runtime = rfile->output->runtime; poll_wait(file, &runtime->sleep, wait); } mask = 0; - if (rfile->input != NULL) { + if (rfile->input) { if (snd_rawmidi_ready(rfile->input)) mask |= POLLIN | POLLRDNORM; } - if (rfile->output != NULL) { + if (rfile->output) { if (snd_rawmidi_ready(rfile->output)) mask |= POLLOUT | POLLWRNORM; } @@ -1547,7 +1547,7 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int device, INIT_LIST_HEAD(&rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams); INIT_LIST_HEAD(&rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams); - if (id != NULL) + if (id) strlcpy(rmidi->id, id, sizeof(rmidi->id)); snd_device_initialize(&rmidi->dev, card); -- 2.15.0