Commit 252026ab authored by Brian Norris's avatar Brian Norris

mtd: nand: lpc32xx_slc: don't call nand_default_bbt directly

This driver is doing some strange logic here. If it doesn't have
flash-based BBT enabled, it allows nand_scan_tail() to scan the BBT. But
if it is using flash-based BBT, it tells nand_scan_tail() to skip
scanning, then it immediately calls the default BBT scanning function
itself.

As I read it, this logic is equivalent to the default nand_scan_tail()
behavior without interfering with NAND_SKIP_BBTSCAN or calling
nand_default_bbt() directly at all.
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 2ee41fa0
...@@ -893,7 +893,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -893,7 +893,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
/* Avoid extra scan if using BBT, setup BBT support */ /* Avoid extra scan if using BBT, setup BBT support */
if (host->ncfg->use_bbt) { if (host->ncfg->use_bbt) {
chip->options |= NAND_SKIP_BBTSCAN;
chip->bbt_options |= NAND_BBT_USE_FLASH; chip->bbt_options |= NAND_BBT_USE_FLASH;
/* /*
...@@ -915,13 +914,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -915,13 +914,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
goto err_exit3; goto err_exit3;
} }
/* Standard layout in FLASH for bad block tables */
if (host->ncfg->use_bbt) {
if (nand_default_bbt(mtd) < 0)
dev_err(&pdev->dev,
"Error initializing default bad block tables\n");
}
mtd->name = "nxp_lpc3220_slc"; mtd->name = "nxp_lpc3220_slc";
ppdata.of_node = pdev->dev.of_node; ppdata.of_node = pdev->dev.of_node;
res = mtd_device_parse_register(mtd, NULL, &ppdata, host->ncfg->parts, res = mtd_device_parse_register(mtd, NULL, &ppdata, host->ncfg->parts,
......
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