leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: rawnand: onfi: Use intermediate variables to improve readability

Browse Source 
Before reworking a little bit the ONFI detection code, let's
clean the coding style of the if statements to improve readability.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://lore.kernel.org/linux-mtd/20200428094302.14624-5-miquel.raynal@bootlin.com
This commit is contained in:
Miquel Raynal
2020-04-28 11:42:57 +02:00
parent 1d5d08ee9b
commit 543e34f29d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mtd/nand/raw/nand_onfi.c
View File

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