Commit eee0166d authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Brian Norris

mtd: nand: pxa3xx: Clean pxa_ecc_init() error handling

Let's make pxa_ecc_init() return a negative errno on error or zero
if succesful, which is standard kernel practice. Also, report the
selected ECC strength and step size, which is important information.
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 67a9ad9b
...@@ -1354,7 +1354,6 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info, ...@@ -1354,7 +1354,6 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info,
ecc->mode = NAND_ECC_HW; ecc->mode = NAND_ECC_HW;
ecc->size = 512; ecc->size = 512;
ecc->strength = 1; ecc->strength = 1;
return 1;
} else if (strength == 1 && ecc_stepsize == 512 && page_size == 512) { } else if (strength == 1 && ecc_stepsize == 512 && page_size == 512) {
info->chunk_size = 512; info->chunk_size = 512;
...@@ -1363,7 +1362,6 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info, ...@@ -1363,7 +1362,6 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info,
ecc->mode = NAND_ECC_HW; ecc->mode = NAND_ECC_HW;
ecc->size = 512; ecc->size = 512;
ecc->strength = 1; ecc->strength = 1;
return 1;
/* /*
* Required ECC: 4-bit correction per 512 bytes * Required ECC: 4-bit correction per 512 bytes
...@@ -1378,7 +1376,6 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info, ...@@ -1378,7 +1376,6 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info,
ecc->size = info->chunk_size; ecc->size = info->chunk_size;
ecc->layout = &ecc_layout_2KB_bch4bit; ecc->layout = &ecc_layout_2KB_bch4bit;
ecc->strength = 16; ecc->strength = 16;
return 1;
} else if (strength == 4 && ecc_stepsize == 512 && page_size == 4096) { } else if (strength == 4 && ecc_stepsize == 512 && page_size == 4096) {
info->ecc_bch = 1; info->ecc_bch = 1;
...@@ -1389,7 +1386,6 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info, ...@@ -1389,7 +1386,6 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info,
ecc->size = info->chunk_size; ecc->size = info->chunk_size;
ecc->layout = &ecc_layout_4KB_bch4bit; ecc->layout = &ecc_layout_4KB_bch4bit;
ecc->strength = 16; ecc->strength = 16;
return 1;
/* /*
* Required ECC: 8-bit correction per 512 bytes * Required ECC: 8-bit correction per 512 bytes
...@@ -1404,8 +1400,15 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info, ...@@ -1404,8 +1400,15 @@ static int pxa_ecc_init(struct pxa3xx_nand_info *info,
ecc->size = info->chunk_size; ecc->size = info->chunk_size;
ecc->layout = &ecc_layout_4KB_bch8bit; ecc->layout = &ecc_layout_4KB_bch8bit;
ecc->strength = 16; ecc->strength = 16;
return 1; } else {
dev_err(&info->pdev->dev,
"ECC strength %d at page size %d is not supported\n",
strength, page_size);
return -ENODEV;
} }
dev_info(&info->pdev->dev, "ECC strength %d, ECC step size %d\n",
ecc->strength, ecc->size);
return 0; return 0;
} }
...@@ -1527,12 +1530,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) ...@@ -1527,12 +1530,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
ret = pxa_ecc_init(info, &chip->ecc, ecc_strength, ret = pxa_ecc_init(info, &chip->ecc, ecc_strength,
ecc_step, mtd->writesize); ecc_step, mtd->writesize);
if (!ret) { if (ret)
dev_err(&info->pdev->dev, return ret;
"ECC strength %d at page size %d is not supported\n",
ecc_strength, mtd->writesize);
return -ENODEV;
}
/* calculate addressing information */ /* calculate addressing information */
if (mtd->writesize >= 2048) if (mtd->writesize >= 2048)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment