From: SF Markus Elfring <elfring@users.sourceforge.net>
To: alsa-devel@alsa-project.org, Arnd Bergmann <arnd@arndb.de>,
Arvind Yadav <arvind.yadav.cs@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Ingo Molnar <mingo@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.de>,
Takashi Sakamoto <o-takashi@sakamocchi.jp>,
Vegard Nossum <vegard.nossum@oracle.com>
Cc: kernel-janitors@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/6] ALSA: pcm: Adjust 11 checks for null pointers
Date: Wed, 23 Aug 2017 08:25:49 +0000 [thread overview]
Message-ID: <fc79090d-7ed8-9083-4726-29769e0ef8d8@users.sourceforge.net> (raw)
In-Reply-To: <800d7aa6-d8f2-cbf5-caaa-7e4006976e68@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 23 Aug 2017 09:28:00 +0200
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 <elfring@users.sourceforge.net>
---
sound/core/pcm.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index c790f79e45ae..24047a07dc7f 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -132,7 +132,7 @@ static int snd_pcm_control_ioctl(struct snd_card *card,
return -EFAULT;
mutex_lock(®ister_mutex);
pcm = snd_pcm_get(card, device);
- if (pcm = NULL) {
+ if (!pcm) {
err = -ENXIO;
goto _error;
}
@@ -149,7 +149,7 @@ static int snd_pcm_control_ioctl(struct snd_card *card,
substream = substream->next)
if (substream->number = (int)subdevice)
break;
- if (substream = NULL) {
+ if (!substream) {
err = -ENXIO;
goto _error;
}
@@ -733,7 +733,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)
substream->stream = stream;
sprintf(substream->name, "subdevice #%i", idx);
substream->buffer_bytes_max = UINT_MAX;
- if (prev = NULL)
+ if (!prev)
pstr->substream = substream;
else
prev->next = substream;
@@ -743,7 +743,7 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)
if (err < 0) {
pcm_err(pcm,
"Error in snd_pcm_stream_proc_init\n");
- if (prev = NULL)
+ if (!prev)
pstr->substream = NULL;
else
prev->next = NULL;
@@ -951,7 +951,7 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,
return -EINVAL;
*rsubstream = NULL;
pstr = &pcm->streams[stream];
- if (pstr->substream = NULL || pstr->substream_count = 0)
+ if (!pstr->substream || pstr->substream_count = 0)
return -ENODEV;
card = pcm->card;
@@ -993,16 +993,16 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,
substream->number = prefer_subdevice))
break;
}
- if (substream = NULL)
+ if (!substream)
return -EAGAIN;
runtime = kzalloc(sizeof(*runtime), GFP_KERNEL);
- if (runtime = NULL)
+ if (!runtime)
return -ENOMEM;
size = PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status));
runtime->status = snd_malloc_pages(size, GFP_KERNEL);
- if (runtime->status = NULL) {
+ if (!runtime->status) {
kfree(runtime);
return -ENOMEM;
}
@@ -1010,7 +1010,7 @@ int snd_pcm_attach_substream(struct snd_pcm *pcm, int stream,
size = PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control));
runtime->control = snd_malloc_pages(size, GFP_KERNEL);
- if (runtime->control = NULL) {
+ if (!runtime->control) {
snd_free_pages((void*)runtime->status,
PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)));
kfree(runtime);
@@ -1040,7 +1040,7 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream)
if (PCM_RUNTIME_CHECK(substream))
return;
runtime = substream->runtime;
- if (runtime->private_free != NULL)
+ if (runtime->private_free)
runtime->private_free(runtime);
snd_free_pages((void*)runtime->status,
PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)));
@@ -1107,7 +1107,7 @@ static int snd_pcm_dev_register(struct snd_device *device)
goto unlock;
for (cidx = 0; cidx < 2; cidx++) {
int devtype = -1;
- if (pcm->streams[cidx].substream = NULL)
+ if (!pcm->streams[cidx].substream)
continue;
switch (cidx) {
case SNDRV_PCM_STREAM_PLAYBACK:
--
2.14.0
next prev parent reply other threads:[~2017-08-23 8:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 19:12 [PATCH] ALSA: core: Use common error handling code in two functions SF Markus Elfring
2017-08-23 5:16 ` Takashi Iwai
2017-08-23 8:21 ` [PATCH 0/6] ALSA: core: Fine-tuning for some function implementations SF Markus Elfring
2017-08-23 8:23 ` [PATCH 1/6] ALSA: pcm: Use common error handling code in _snd_pcm_new() SF Markus Elfring
2017-08-23 8:36 ` Takashi Iwai
2017-08-23 8:24 ` [PATCH 2/6] ALSA: pcm: Adjust nine function calls together with a variable assignment SF Markus Elfring
2017-08-23 8:36 ` Takashi Iwai
2017-08-23 8:25 ` SF Markus Elfring [this message]
2017-08-23 8:35 ` [PATCH 3/6] ALSA: pcm: Adjust 11 checks for null pointers Takashi Iwai
2017-08-23 8:27 ` [PATCH 4/6] ALSA: timer: Use common error handling code in alsa_timer_init() SF Markus Elfring
2017-08-23 8:39 ` Takashi Iwai
2017-08-23 8:28 ` [PATCH 5/6] ALSA: timer: Adjust a condition check in snd_timer_resolution() SF Markus Elfring
2017-08-23 8:37 ` Takashi Iwai
2017-08-23 8:29 ` [PATCH 6/6] ALSA: timer: Adjust 13 checks for null pointers SF Markus Elfring
2017-08-23 8:38 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fc79090d-7ed8-9083-4726-29769e0ef8d8@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=arvind.yadav.cs@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=o-takashi@sakamocchi.jp \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
--cc=vegard.nossum@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox