leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: nand: simplify nand_dt_init() usage

Browse Source 
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: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Boris BREZILLON 2015-12-10 09:00:37 +01:00 committed by Brian Norris
parent f12d86afc5
commit 7194a29a9b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/mtd/nand/nand_base.c
View File

@ -3937,11 +3937,17 @@ ident_done:
return type; return type;
} }
static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, static int nand_dt_init(struct nand_chip *chip)
struct device_node *dn)
{ {
struct device_node *dn = nand_get_flash_node(chip);
int ecc_mode, ecc_strength, ecc_step; 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) if (of_get_nand_bus_width(dn) == 16)
chip->options |= NAND_BUSWIDTH_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; struct nand_flash_dev *type;
int ret; int ret;
if (nand_get_flash_node(chip)) { ret = nand_dt_init(chip);
/* MTD can automatically handle DT partitions, etc. */ if (ret)
mtd_set_of_node(mtd, nand_get_flash_node(chip)); return ret;
ret = nand_dt_init(mtd, chip, nand_get_flash_node(chip));
if (ret)
return ret;
}
/* Set the default functions */ /* Set the default functions */
nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16); nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16);