Commit 154f50fb authored by Ezequiel García's avatar Ezequiel García Committed by Brian Norris
Browse files

mtd: pxa3xx_nand: Simplify pxa3xx_nand_scan 



This commit simplifies the initial configuration performed
by pxa3xx_nand_scan. No functionality change is intended.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 66e8e47e

drivers/mtd/nand/pxa3xx_nand.c

+14 −16
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ static void pxa3xx_nand_config_tail(struct pxa3xx_nand_info *info) 
	info->reg_ndcr |= (mtd->writesize == 2048) ? NDCR_PAGE_SZ : 0;

}



static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info)

static void pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info)

{

	struct platform_device *pdev = info->pdev;

	struct pxa3xx_nand_platform_data *pdata = dev_get_platdata(&pdev->dev);
@@ -1426,7 +1426,6 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info) 
	info->reg_ndcr |= (pdata->enable_arbiter) ? NDCR_ND_ARB_EN : 0;

	info->ndtr0cs0 = nand_readl(info, NDTR0CS0);

	info->ndtr1cs0 = nand_readl(info, NDTR1CS0);

	return 0;

}



static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info)
@@ -1597,22 +1596,21 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) 
	int ret;

	uint16_t ecc_strength, ecc_step;



	if (pdata->keep_config && !pxa3xx_nand_detect_config(info))

		goto KEEP_CONFIG;



	if (pdata->keep_config) {

		pxa3xx_nand_detect_config(info);

	} else {

		ret = pxa3xx_nand_config_ident(info);

		if (ret)

			return ret;



		ret = pxa3xx_nand_sensing(host);

		if (ret) {

		dev_info(&info->pdev->dev, "There is no chip on cs %d!\n",

			dev_info(&info->pdev->dev,

				 "There is no chip on cs %d!\n",

				 info->cs);



			return ret;

		}

	}



KEEP_CONFIG:

	if (info->reg_ndcr & NDCR_DWIDTH_M)

		chip->options |= NAND_BUSWIDTH_16;