From: Markus Elfring <Markus.Elfring@web.de>
To: linux-arm-kernel@lists.infradead.org,
Arnd Bergmann <arnd@arndb.de>,
Derek Kiernan <derek.kiernan@xilinx.com>,
Dragan Cvetic <dragan.cvetic@xilinx.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Michal Simek <michal.simek@xilinx.com>
Cc: kernel-janitors@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/2] misc: xilinx_sdfec: Combine three condition checks into one statement in xsdfec_add_ldpc()
Date: Tue, 5 Nov 2019 19:56:23 +0100 [thread overview]
Message-ID: <b927be91-a380-1bba-2b10-f0ca49c477b5@web.de> (raw)
In-Reply-To: <af1ff373-56c0-ca49-36dd-15666d183c95@web.de>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 5 Nov 2019 19:32:25 +0100
The same return code was set after three condition checks.
Thus use a single statement instead.
Fixes: 20ec628e8007ec75c2f884e00004f39eab6289b5 ("misc: xilinx_sdfec: Add ability to configure LDPC")
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/misc/xilinx_sdfec.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
index a622fcf4954a..322d5c6e6d12 100644
--- a/drivers/misc/xilinx_sdfec.c
+++ b/drivers/misc/xilinx_sdfec.c
@@ -653,18 +653,10 @@ static int xsdfec_add_ldpc(struct xsdfec_dev *xsdfec, void __user *arg)
if (IS_ERR(ldpc))
return PTR_ERR(ldpc);
- if (xsdfec->config.code == XSDFEC_TURBO_CODE) {
- ret = -EIO;
- goto err_out;
- }
-
- /* Verify Device has not started */
- if (xsdfec->state == XSDFEC_STARTED) {
- ret = -EIO;
- goto err_out;
- }
-
- if (xsdfec->config.code_wr_protect) {
+ if (xsdfec->config.code == XSDFEC_TURBO_CODE ||
+ /* Verify device has not started */
+ xsdfec->state == XSDFEC_STARTED ||
+ xsdfec->config.code_wr_protect) {
ret = -EIO;
goto err_out;
}
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-05 18:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 18:52 [PATCH 0/2] misc: xilinx_sdfec: Adjustments for xsdfec_add_ldpc() Markus Elfring
2019-11-05 18:54 ` [PATCH 1/2] misc: xilinx_sdfec: Use memdup_user() rather than duplicating its implementation Markus Elfring
2019-11-07 15:40 ` Dragan Cvetic
2019-11-10 22:18 ` Dragan Cvetic
2019-11-05 18:56 ` Markus Elfring [this message]
2019-11-07 16:30 ` [PATCH 2/2] misc: xilinx_sdfec: Combine three condition checks into one statement in xsdfec_add_ldpc() Dragan Cvetic
2019-11-07 21:58 ` Dragan Cvetic
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=b927be91-a380-1bba-2b10-f0ca49c477b5@web.de \
--to=markus.elfring@web.de \
--cc=arnd@arndb.de \
--cc=derek.kiernan@xilinx.com \
--cc=dragan.cvetic@xilinx.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.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;
as well as URLs for NNTP newsgroup(s).