mtd: rawnand: onfi: Use intermediate variables to improve readability (543e34f2) · Commits · 戴 / test

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:

drivers/mtd/nand/raw/nand_onfi.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}