Commit 7194a29a authored by Boris BREZILLON's avatar Boris BREZILLON Committed by Brian Norris

mtd: nand: simplify nand_dt_init() usage

nand_dt_init() function requires 3 arguments where it actually needs one
(dn and mtd can both be retrieved from chip). Drop these parameters.

Testing for dn != NULL inside nand_dt_init() also helps simplifying the
caller code.
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent f12d86af
......@@ -3937,11 +3937,17 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
return type;
}
static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip,
struct device_node *dn)
static int nand_dt_init(struct nand_chip *chip)
{
struct device_node *dn = nand_get_flash_node(chip);
int ecc_mode, ecc_strength, ecc_step;
if (!dn)
return 0;
/* MTD can automatically handle DT partitions, etc. */
mtd_set_of_node(nand_to_mtd(chip), dn);
if (of_get_nand_bus_width(dn) == 16)
chip->options |= NAND_BUSWIDTH_16;
......@@ -3989,14 +3995,9 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
struct nand_flash_dev *type;
int ret;
if (nand_get_flash_node(chip)) {
/* MTD can automatically handle DT partitions, etc. */
mtd_set_of_node(mtd, nand_get_flash_node(chip));
ret = nand_dt_init(mtd, chip, nand_get_flash_node(chip));
ret = nand_dt_init(chip);
if (ret)
return ret;
}
/* Set the default functions */
nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16);
......
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