hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: nand: vf610_nfc: use nand_check_erased_ecc_chunk() helper 

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Brian Norris 2015-09-29 14:11:56 -07:00
parent b70af9bef4
commit 48c25cf441
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mtd/nand/vf610_nfc.c
View File

@ -561,7 +561,6 @@ static inline int vf610_nfc_correct_data(struct mtd_info *mtd, uint8_t *dat,
u32 ecc_status_off = NFC_MAIN_AREA(0) + ECC_SRAM_ADDR + ECC_STATUS; u32 ecc_status_off = NFC_MAIN_AREA(0) + ECC_SRAM_ADDR + ECC_STATUS;
u8 ecc_status; u8 ecc_status;
u8 ecc_count; u8 ecc_count;
int flips;
int flips_threshold = nfc->chip.ecc.strength / 2; int flips_threshold = nfc->chip.ecc.strength / 2;
ecc_status = vf610_nfc_read(nfc, ecc_status_off) & 0xff; ecc_status = vf610_nfc_read(nfc, ecc_status_off) & 0xff;
@ -578,16 +577,9 @@ static inline int vf610_nfc_correct_data(struct mtd_info *mtd, uint8_t *dat,
* On an erased page, bit count (including OOB) should be zero or * On an erased page, bit count (including OOB) should be zero or
* at least less then half of the ECC strength. * at least less then half of the ECC strength.
*/ */
flips = count_written_bits(dat, nfc->chip.ecc.size, flips_threshold); return nand_check_erased_ecc_chunk(dat, nfc->chip.ecc.size, oob,
flips += count_written_bits(oob, mtd->oobsize, flips_threshold); mtd->oobsize, NULL, 0,
flips_threshold);
if (unlikely(flips > flips_threshold))
return -EINVAL;
/* Erased page. */
memset(dat, 0xff, nfc->chip.ecc.size);
memset(oob, 0xff, mtd->oobsize);
return flips;
} }
static int vf610_nfc_read_page(struct mtd_info *mtd, struct nand_chip *chip, static int vf610_nfc_read_page(struct mtd_info *mtd, struct nand_chip *chip,