From: SF Markus Elfring <elfring@users.sourceforge.net> To: alsa-devel@alsa-project.org, Clemens Ladisch <clemens@ladisch.de>, Jaroslav Kysela <perex@perex.cz>, Martin Koegler <martin.koegler@chello.at>, Takashi Iwai <tiwai@suse.com>, Takashi Sakamoto <o-takashi@sakamocchi.jp> Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org Subject: [PATCH 5/7] ALSA: seq: Adjust 16 function calls together with a variable assignment Date: Tue, 24 Jan 2017 11:25:14 +0100 [thread overview] Message-ID: <c3f73d40-c9dc-2682-0b94-f997763aaf7b@users.sourceforge.net> (raw) In-Reply-To: <f2404d64-27c8-4afa-b893-fc72601c0136@users.sourceforge.net> From: Markus Elfring <elfring@users.sourceforge.net> Date: Tue, 24 Jan 2017 09:44:22 +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 <elfring@users.sourceforge.net> --- sound/core/seq/seq_clientmgr.c | 52 ++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index b9518e7cb623..519968841ccc 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -400,7 +400,11 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count, if (snd_BUG_ON(!client)) return -ENXIO; - if (!client->accept_input || (fifo = client->data.user.fifo) == NULL) + if (!client->accept_input) + return -ENXIO; + + fifo = client->data.user.fifo; + if (!fifo) return -ENXIO; if (atomic_read(&fifo->overflow) > 0) { @@ -419,9 +423,9 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count, int nonblock; nonblock = (file->f_flags & O_NONBLOCK) || result > 0; - if ((err = snd_seq_fifo_cell_out(fifo, &cell, nonblock)) < 0) { + err = snd_seq_fifo_cell_out(fifo, &cell, nonblock); + if (err < 0) break; - } if (snd_seq_ev_is_variable(&cell->event)) { struct snd_seq_event tmpev; tmpev = cell->event; @@ -948,7 +952,8 @@ static int snd_seq_client_enqueue_event(struct snd_seq_client *client, return err; /* we got a cell. enqueue it. */ - if ((err = snd_seq_enqueue_event(cell, atomic, hop)) < 0) { + err = snd_seq_enqueue_event(cell, atomic, hop); + if (err < 0) { snd_seq_cell_free(cell); return err; } @@ -1273,7 +1278,8 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client, void *arg) return -EINVAL; } if (client->type == KERNEL_CLIENT) { - if ((callback = info->kernel) != NULL) { + callback = info->kernel; + if (callback) { if (callback->owner) port->owner = callback->owner; port->private_data = callback->private_data; @@ -1426,13 +1432,17 @@ static int snd_seq_ioctl_subscribe_port(struct snd_seq_client *client, struct snd_seq_client *receiver, *sender; struct snd_seq_client_port *sport, *dport; - if ((receiver = snd_seq_client_use_ptr(subs->dest.client)) == NULL) + receiver = snd_seq_client_use_ptr(subs->dest.client); + if (!receiver) goto exit; - if ((sender = snd_seq_client_use_ptr(subs->sender.client)) == NULL) + sender = snd_seq_client_use_ptr(subs->sender.client); + if (!sender) goto unlock_receiver; - if ((sport = snd_seq_port_use_ptr(sender, subs->sender.port)) == NULL) + sport = snd_seq_port_use_ptr(sender, subs->sender.port); + if (!sport) goto unlock_sender; - if ((dport = snd_seq_port_use_ptr(receiver, subs->dest.port)) == NULL) + dport = snd_seq_port_use_ptr(receiver, subs->dest.port); + if (!dport) goto unlock_sport; result = check_subscription_permission(client, sport, dport, subs); @@ -1468,13 +1478,17 @@ static int snd_seq_ioctl_unsubscribe_port(struct snd_seq_client *client, struct snd_seq_client *receiver, *sender; struct snd_seq_client_port *sport, *dport; - if ((receiver = snd_seq_client_use_ptr(subs->dest.client)) == NULL) + receiver = snd_seq_client_use_ptr(subs->dest.client); + if (!receiver) goto exit; - if ((sender = snd_seq_client_use_ptr(subs->sender.client)) == NULL) + sender = snd_seq_client_use_ptr(subs->sender.client); + if (!sender) goto unlock_receiver; - if ((sport = snd_seq_port_use_ptr(sender, subs->sender.port)) == NULL) + sport = snd_seq_port_use_ptr(sender, subs->sender.port); + if (!sport) goto unlock_sender; - if ((dport = snd_seq_port_use_ptr(receiver, subs->dest.port)) == NULL) + dport = snd_seq_port_use_ptr(receiver, subs->dest.port); + if (!dport) goto unlock_sport; result = check_subscription_permission(client, sport, dport, subs); @@ -1896,9 +1910,11 @@ static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client, struct snd_seq_client_port *sport; struct snd_seq_subscribers *p; - if ((sender = snd_seq_client_use_ptr(subs->sender.client)) == NULL) + sender = snd_seq_client_use_ptr(subs->sender.client); + if (!sender) goto exit; - if ((sport = snd_seq_port_use_ptr(sender, subs->sender.port)) == NULL) + sport = snd_seq_port_use_ptr(sender, subs->sender.port); + if (!sport) goto unlock_client; p = snd_seq_port_get_subscription(&sport->c_src, &subs->dest); if (p) { @@ -1928,9 +1944,11 @@ static int snd_seq_ioctl_query_subs(struct snd_seq_client *client, void *arg) struct list_head *p; int i; - if ((cptr = snd_seq_client_use_ptr(subs->root.client)) == NULL) + cptr = snd_seq_client_use_ptr(subs->root.client); + if (!cptr) goto exit; - if ((port = snd_seq_port_use_ptr(cptr, subs->root.port)) == NULL) + port = snd_seq_port_use_ptr(cptr, subs->root.port); + if (!port) goto unlock_client; switch (subs->type) { -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: SF Markus Elfring <elfring@users.sourceforge.net> To: alsa-devel@alsa-project.org, Clemens Ladisch <clemens@ladisch.de>, Jaroslav Kysela <perex@perex.cz>, Martin Koegler <martin.koegler@chello.at>, Takashi Iwai <tiwai@suse.com>, Takashi Sakamoto <o-takashi@sakamocchi.jp> Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org Subject: [PATCH 5/7] ALSA: seq: Adjust 16 function calls together with a variable assignment Date: Tue, 24 Jan 2017 10:25:14 +0000 [thread overview] Message-ID: <c3f73d40-c9dc-2682-0b94-f997763aaf7b@users.sourceforge.net> (raw) In-Reply-To: <f2404d64-27c8-4afa-b893-fc72601c0136@users.sourceforge.net> From: Markus Elfring <elfring@users.sourceforge.net> Date: Tue, 24 Jan 2017 09:44:22 +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 <elfring@users.sourceforge.net> --- sound/core/seq/seq_clientmgr.c | 52 ++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index b9518e7cb623..519968841ccc 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -400,7 +400,11 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count, if (snd_BUG_ON(!client)) return -ENXIO; - if (!client->accept_input || (fifo = client->data.user.fifo) = NULL) + if (!client->accept_input) + return -ENXIO; + + fifo = client->data.user.fifo; + if (!fifo) return -ENXIO; if (atomic_read(&fifo->overflow) > 0) { @@ -419,9 +423,9 @@ static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count, int nonblock; nonblock = (file->f_flags & O_NONBLOCK) || result > 0; - if ((err = snd_seq_fifo_cell_out(fifo, &cell, nonblock)) < 0) { + err = snd_seq_fifo_cell_out(fifo, &cell, nonblock); + if (err < 0) break; - } if (snd_seq_ev_is_variable(&cell->event)) { struct snd_seq_event tmpev; tmpev = cell->event; @@ -948,7 +952,8 @@ static int snd_seq_client_enqueue_event(struct snd_seq_client *client, return err; /* we got a cell. enqueue it. */ - if ((err = snd_seq_enqueue_event(cell, atomic, hop)) < 0) { + err = snd_seq_enqueue_event(cell, atomic, hop); + if (err < 0) { snd_seq_cell_free(cell); return err; } @@ -1273,7 +1278,8 @@ static int snd_seq_ioctl_create_port(struct snd_seq_client *client, void *arg) return -EINVAL; } if (client->type = KERNEL_CLIENT) { - if ((callback = info->kernel) != NULL) { + callback = info->kernel; + if (callback) { if (callback->owner) port->owner = callback->owner; port->private_data = callback->private_data; @@ -1426,13 +1432,17 @@ static int snd_seq_ioctl_subscribe_port(struct snd_seq_client *client, struct snd_seq_client *receiver, *sender; struct snd_seq_client_port *sport, *dport; - if ((receiver = snd_seq_client_use_ptr(subs->dest.client)) = NULL) + receiver = snd_seq_client_use_ptr(subs->dest.client); + if (!receiver) goto exit; - if ((sender = snd_seq_client_use_ptr(subs->sender.client)) = NULL) + sender = snd_seq_client_use_ptr(subs->sender.client); + if (!sender) goto unlock_receiver; - if ((sport = snd_seq_port_use_ptr(sender, subs->sender.port)) = NULL) + sport = snd_seq_port_use_ptr(sender, subs->sender.port); + if (!sport) goto unlock_sender; - if ((dport = snd_seq_port_use_ptr(receiver, subs->dest.port)) = NULL) + dport = snd_seq_port_use_ptr(receiver, subs->dest.port); + if (!dport) goto unlock_sport; result = check_subscription_permission(client, sport, dport, subs); @@ -1468,13 +1478,17 @@ static int snd_seq_ioctl_unsubscribe_port(struct snd_seq_client *client, struct snd_seq_client *receiver, *sender; struct snd_seq_client_port *sport, *dport; - if ((receiver = snd_seq_client_use_ptr(subs->dest.client)) = NULL) + receiver = snd_seq_client_use_ptr(subs->dest.client); + if (!receiver) goto exit; - if ((sender = snd_seq_client_use_ptr(subs->sender.client)) = NULL) + sender = snd_seq_client_use_ptr(subs->sender.client); + if (!sender) goto unlock_receiver; - if ((sport = snd_seq_port_use_ptr(sender, subs->sender.port)) = NULL) + sport = snd_seq_port_use_ptr(sender, subs->sender.port); + if (!sport) goto unlock_sender; - if ((dport = snd_seq_port_use_ptr(receiver, subs->dest.port)) = NULL) + dport = snd_seq_port_use_ptr(receiver, subs->dest.port); + if (!dport) goto unlock_sport; result = check_subscription_permission(client, sport, dport, subs); @@ -1896,9 +1910,11 @@ static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client, struct snd_seq_client_port *sport; struct snd_seq_subscribers *p; - if ((sender = snd_seq_client_use_ptr(subs->sender.client)) = NULL) + sender = snd_seq_client_use_ptr(subs->sender.client); + if (!sender) goto exit; - if ((sport = snd_seq_port_use_ptr(sender, subs->sender.port)) = NULL) + sport = snd_seq_port_use_ptr(sender, subs->sender.port); + if (!sport) goto unlock_client; p = snd_seq_port_get_subscription(&sport->c_src, &subs->dest); if (p) { @@ -1928,9 +1944,11 @@ static int snd_seq_ioctl_query_subs(struct snd_seq_client *client, void *arg) struct list_head *p; int i; - if ((cptr = snd_seq_client_use_ptr(subs->root.client)) = NULL) + cptr = snd_seq_client_use_ptr(subs->root.client); + if (!cptr) goto exit; - if ((port = snd_seq_port_use_ptr(cptr, subs->root.port)) = NULL) + port = snd_seq_port_use_ptr(cptr, subs->root.port); + if (!port) goto unlock_client; switch (subs->type) { -- 2.11.0
next prev parent reply other threads:[~2017-01-24 10:26 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-24 10:19 [PATCH 0/7] ALSA: Fine-tuning for several function implementations SF Markus Elfring 2017-01-24 10:19 ` SF Markus Elfring 2017-01-24 10:21 ` [PATCH 1/7] ALSA: seq: Delete unnecessary checks in snd_seq_ioctl_query_subs() SF Markus Elfring 2017-01-24 10:21 ` SF Markus Elfring 2017-01-24 10:22 ` [PATCH 2/7] ALSA: seq: Delete unnecessary checks in snd_seq_ioctl_get_subscription() SF Markus Elfring 2017-01-24 10:22 ` SF Markus Elfring 2017-01-24 10:23 ` [PATCH 3/7] ALSA: seq: Delete unnecessary checks in snd_seq_ioctl_unsubscribe_port() SF Markus Elfring 2017-01-24 10:23 ` SF Markus Elfring 2017-01-24 10:24 ` [PATCH 4/7] ALSA: seq: Delete unnecessary checks in snd_seq_ioctl_subscribe_port() SF Markus Elfring 2017-01-24 10:24 ` SF Markus Elfring 2017-01-24 10:25 ` SF Markus Elfring [this message] 2017-01-24 10:25 ` [PATCH 5/7] ALSA: seq: Adjust 16 function calls together with a variable assignment SF Markus Elfring 2017-01-24 10:26 ` [PATCH 6/7] dmasound_core: Move two assignments for the variable "ret" in state_open() SF Markus Elfring 2017-01-24 10:26 ` SF Markus Elfring 2017-01-25 7:40 ` [alsa-devel] " Clemens Ladisch 2017-01-25 7:40 ` [alsa-devel] [PATCH 6/7] dmasound_core: Move two assignments for the variable "ret" in state_ope Clemens Ladisch 2017-01-24 10:27 ` [PATCH 7/7] dmasound_core: Adjust six function calls together with a variable assignment SF Markus Elfring 2017-01-24 10:27 ` SF Markus Elfring 2017-11-14 11:48 ` [PATCH 0/7] ALSA: Fine-tuning for several function implementations SF Markus Elfring 2017-11-14 11:48 ` SF Markus Elfring 2017-11-14 11:48 ` SF Markus Elfring
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=c3f73d40-c9dc-2682-0b94-f997763aaf7b@users.sourceforge.net \ --to=elfring@users.sourceforge.net \ --cc=alsa-devel@alsa-project.org \ --cc=clemens@ladisch.de \ --cc=kernel-janitors@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=martin.koegler@chello.at \ --cc=o-takashi@sakamocchi.jp \ --cc=perex@perex.cz \ --cc=tiwai@suse.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.