aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/nand_base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/nand/nand_base.c')
-rw-r--r--drivers/mtd/nand/nand_base.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index ae6e7c47f8e2..801cad1de9eb 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -3936,8 +3936,7 @@ int nand_scan_tail(struct mtd_info *mtd)
3936 case NAND_ECC_HW_OOB_FIRST: 3936 case NAND_ECC_HW_OOB_FIRST:
3937 /* Similar to NAND_ECC_HW, but a separate read_page handle */ 3937 /* Similar to NAND_ECC_HW, but a separate read_page handle */
3938 if (!ecc->calculate || !ecc->correct || !ecc->hwctl) { 3938 if (!ecc->calculate || !ecc->correct || !ecc->hwctl) {
3939 pr_warn("No ECC functions supplied; " 3939 pr_warn("No ECC functions supplied; hardware ECC not possible\n");
3940 "hardware ECC not possible\n");
3941 BUG(); 3940 BUG();
3942 } 3941 }
3943 if (!ecc->read_page) 3942 if (!ecc->read_page)
@@ -3968,8 +3967,7 @@ int nand_scan_tail(struct mtd_info *mtd)
3968 ecc->read_page == nand_read_page_hwecc || 3967 ecc->read_page == nand_read_page_hwecc ||
3969 !ecc->write_page || 3968 !ecc->write_page ||
3970 ecc->write_page == nand_write_page_hwecc)) { 3969 ecc->write_page == nand_write_page_hwecc)) {
3971 pr_warn("No ECC functions supplied; " 3970 pr_warn("No ECC functions supplied; hardware ECC not possible\n");
3972 "hardware ECC not possible\n");
3973 BUG(); 3971 BUG();
3974 } 3972 }
3975 /* Use standard syndrome read/write page function? */ 3973 /* Use standard syndrome read/write page function? */
@@ -3993,9 +3991,8 @@ int nand_scan_tail(struct mtd_info *mtd)
3993 } 3991 }
3994 break; 3992 break;
3995 } 3993 }
3996 pr_warn("%d byte HW ECC not possible on " 3994 pr_warn("%d byte HW ECC not possible on %d byte page size, fallback to SW ECC\n",
3997 "%d byte page size, fallback to SW ECC\n", 3995 ecc->size, mtd->writesize);
3998 ecc->size, mtd->writesize);
3999 ecc->mode = NAND_ECC_SOFT; 3996 ecc->mode = NAND_ECC_SOFT;
4000 3997
4001 case NAND_ECC_SOFT: 3998 case NAND_ECC_SOFT:
@@ -4048,8 +4045,7 @@ int nand_scan_tail(struct mtd_info *mtd)
4048 break; 4045 break;
4049 4046
4050 case NAND_ECC_NONE: 4047 case NAND_ECC_NONE:
4051 pr_warn("NAND_ECC_NONE selected by board driver. " 4048 pr_warn("NAND_ECC_NONE selected by board driver. This is not recommended!\n");
4052 "This is not recommended!\n");
4053 ecc->read_page = nand_read_page_raw; 4049 ecc->read_page = nand_read_page_raw;
4054 ecc->write_page = nand_write_page_raw; 4050 ecc->write_page = nand_write_page_raw;
4055 ecc->read_oob = nand_read_oob_std; 4051 ecc->read_oob = nand_read_oob_std;