All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Richard Weinberger <richard@nod.at>,
	Vignesh Raghavendra <vigneshr@ti.com>,
	Tudor Ambarus <Tudor.Ambarus@microchip.com>,
	<linux-mtd@lists.infradead.org>
Cc: Michal Simek <monstr@monstr.eu>,
	Boris Brezillon <boris.brezillon@collabora.com>,
	Naga Sureshkumar Relli <nagasure@xilinx.com>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH 4/8] mtd: rawnand: onfi: Use an intermediate variable to decomplefixy conditions
Date: Tue, 21 Apr 2020 18:46:33 +0200	[thread overview]
Message-ID: <20200421164637.8086-5-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20200421164637.8086-1-miquel.raynal@bootlin.com>

Before reworking a little bit the ONFI detection code, let's
decomplefixy the if statements.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 drivers/mtd/nand/raw/nand_onfi.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/nand_onfi.c b/drivers/mtd/nand/raw/nand_onfi.c
index 8fe8d7bdd203..7d9a3130443a 100644
--- a/drivers/mtd/nand/raw/nand_onfi.c
+++ b/drivers/mtd/nand/raw/nand_onfi.c
@@ -146,6 +146,7 @@ int nand_onfi_detect(struct nand_chip *chip)
 	int onfi_version = 0;
 	char id[4];
 	int i, ret, val;
+	u16 crc;
 
 	memorg = nanddev_get_memorg(&chip->base);
 
@@ -172,8 +173,8 @@ int nand_onfi_detect(struct nand_chip *chip)
 			goto free_onfi_param_page;
 		}
 
-		if (onfi_crc16(ONFI_CRC_BASE, (u8 *)&p[i], 254) ==
-		    le16_to_cpu(p[i].crc)) {
+		crc = onfi_crc16(ONFI_CRC_BASE, (u8 *)&p[i], 254);
+		if (crc == le16_to_cpu(p[i].crc)) {
 			if (i)
 				memcpy(p, &p[i], sizeof(*p));
 			break;
@@ -187,8 +188,8 @@ int nand_onfi_detect(struct nand_chip *chip)
 		nand_bit_wise_majority(srcbufs, ARRAY_SIZE(srcbufs), p,
 				       sizeof(*p));
 
-		if (onfi_crc16(ONFI_CRC_BASE, (u8 *)p, 254) !=
-				le16_to_cpu(p->crc)) {
+		crc = onfi_crc16(ONFI_CRC_BASE, (u8 *)p, 254);
+		if (crc != le16_to_cpu(p->crc)) {
 			pr_err("ONFI parameter recovery failed, aborting\n");
 			goto free_onfi_param_page;
 		}
-- 
2.20.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

  parent reply	other threads:[~2020-04-21 16:47 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-21 16:46 [PATCH 0/8] Misc timing changes Miquel Raynal
2020-04-21 16:46 ` [PATCH 1/8] mtd: rawnand: timings: Add mode information to the timings structure Miquel Raynal
2020-04-22  6:36   ` Boris Brezillon
2020-04-21 16:46 ` [PATCH 2/8] mtd: rawnand: timings: Fix default tR_max and tCCS_min timings Miquel Raynal
2020-04-22  6:47   ` Boris Brezillon
2020-04-21 16:46 ` [PATCH 3/8] mtd: rawnand: onfi: Fix redundancy detection check Miquel Raynal
2020-04-22  6:49   ` Boris Brezillon
2020-04-21 16:46 ` Miquel Raynal [this message]
2020-04-22  6:51   ` [PATCH 4/8] mtd: rawnand: onfi: Use an intermediate variable to decomplefixy conditions Boris Brezillon
2020-04-21 16:46 ` [PATCH 5/8] mtd: rawnand: onfi: Avoid doing a copy of the parameter page Miquel Raynal
2020-04-22  6:54   ` Boris Brezillon
2020-04-21 16:46 ` [PATCH 6/8] mtd: rawnand: onfi: Simplify the NAND operations during detection Miquel Raynal
2020-04-22  7:00   ` Boris Brezillon
2020-04-22  7:25     ` Miquel Raynal
2020-04-21 16:46 ` [PATCH 7/8] mtd: rawnand: jedec: Use an intermediate variable to decomplefixy conditions Miquel Raynal
2020-04-22  7:02   ` Boris Brezillon
2020-04-22  8:49   ` Sergei Shtylyov
2020-04-22  9:33     ` Miquel Raynal
2020-04-21 16:46 ` [PATCH 8/8] mtd: rawnand: jedec: Simplify the NAND operations during detection Miquel Raynal
2020-04-22  7:05   ` Boris Brezillon

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=20200421164637.8086-5-miquel.raynal@bootlin.com \
    --to=miquel.raynal@bootlin.com \
    --cc=Tudor.Ambarus@microchip.com \
    --cc=boris.brezillon@collabora.com \
    --cc=linux-mtd@lists.infradead.org \
    --cc=monstr@monstr.eu \
    --cc=nagasure@xilinx.com \
    --cc=richard@nod.at \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=vigneshr@ti.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 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.