From 7ac43aedb345367bd794ac707266059542f12ccb Mon Sep 17 00:00:00 2001 From: Abhishek Sahu Date: Tue, 7 Nov 2017 12:28:17 +0530 Subject: [PATCH] mtd: nand: qcom: remove unused status code for bad page NANDC_RESULT_BAD_PAGE is not being returned by any operation, so it can be removed. Change-Id: Ia90e4e6b7ef7577d069d312d51083b50f49bf980 Signed-off-by: Abhishek Sahu --- arch/arm/include/asm/arch-qca-common/qpic_nand.h | 3 +-- drivers/mtd/nand/qpic_nand.c | 14 ++------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/arm/include/asm/arch-qca-common/qpic_nand.h b/arch/arm/include/asm/arch-qca-common/qpic_nand.h index 64460c87e2..231c9fa381 100644 --- a/arch/arm/include/asm/arch-qca-common/qpic_nand.h +++ b/arch/arm/include/asm/arch-qca-common/qpic_nand.h @@ -288,8 +288,7 @@ typedef enum { NANDC_RESULT_TIMEOUT = 2, NANDC_RESULT_PARAM_INVALID = 3, NANDC_RESULT_DEV_NOT_SUPPORTED = 4, - NANDC_RESULT_BAD_PAGE = 5, - NANDC_RESULT_BAD_BLOCK = 6, + NANDC_RESULT_BAD_BLOCK = 5, } nand_result_t; enum nand_bad_block_value diff --git a/drivers/mtd/nand/qpic_nand.c b/drivers/mtd/nand/qpic_nand.c index faa9498812..985ab83a49 100644 --- a/drivers/mtd/nand/qpic_nand.c +++ b/drivers/mtd/nand/qpic_nand.c @@ -1820,7 +1820,6 @@ static int qpic_nand_read_oob(struct mtd_info *mtd, loff_t to, struct nand_chip *chip = MTD_NAND_CHIP(mtd); uint32_t start_page; uint32_t num_pages; - loff_t offs; uint32_t corrected; enum nand_cfg_value cfg_mode; @@ -1863,13 +1862,9 @@ static int qpic_nand_read_oob(struct mtd_info *mtd, loff_t to, ret = qpic_nand_read_page(mtd, start_page + i, cfg_mode, &page_ops); - if (ret == NANDC_RESULT_BAD_PAGE) { - offs = (start_page + i) << chip->page_shift; - qpic_nand_mark_badblock(mtd, offs); - } if (ret) { - printf("qpic_nand_read: reading page %d failed with %d err \n", - start_page + i, ret); + printf("%s: reading page %d failed with %d err\n", + __func__, start_page + i, ret); return ret; } qpic_nand_read_datcopy(mtd, ops); @@ -1989,7 +1984,6 @@ static int qpic_nand_write_oob(struct mtd_info *mtd, loff_t to, struct qpic_nand_dev *dev = MTD_QPIC_NAND_DEV(mtd); int i, ret = NANDC_RESULT_SUCCESS; struct nand_chip *chip = MTD_NAND_CHIP(mtd); - loff_t offs; u_long start_page; u_long num_pages; enum nand_cfg_value cfg_mode; @@ -2045,10 +2039,6 @@ static int qpic_nand_write_oob(struct mtd_info *mtd, loff_t to, printf("flash_write: write failure @ page %ld, block %ld\n", start_page + i, (start_page + i) / (dev->num_pages_per_blk)); - if (ret == NANDC_RESULT_BAD_PAGE) { - offs = (start_page + i) << chip->page_shift; - qpic_nand_mark_badblock(mtd, offs); - } goto out; } else { qpic_nand_write_datinc(mtd, ops);