mtd: nand: drop unnecessary partition parser data
All of these drivers set up a parser data struct just to communicate DT partition data. This field has been deprecated and is instead supported by telling nand_scan_ident() about the 'flash_node'. This patch: * sets chip->flash_node for those drivers that didn't already (but used OF partitioning) * drops the parser data * switches to the simpler mtd_device_register() where possible, now that we've eliminated one of the auxiliary parameters Now that we've assigned chip->flash_node for these drivers, we can probably rely on nand_dt_init() to do more of the DT parsing for us, but for now, I don't want to fiddle with each of these drivers. The parsing is done in duplicate for now on some drivers. I don't think this should break things. (Famous last words.) (Rolled in some changes by Boris Brezillon) Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
@@ -763,7 +763,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
|
||||
struct mtd_info *mtd;
|
||||
struct nand_chip *chip;
|
||||
struct resource *rc;
|
||||
struct mtd_part_parser_data ppdata = {};
|
||||
int res;
|
||||
|
||||
rc = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
@@ -803,6 +802,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
|
||||
mtd = &host->mtd;
|
||||
chip = &host->nand_chip;
|
||||
chip->priv = host;
|
||||
nand_set_flash_node(chip, pdev->dev.of_node);
|
||||
mtd->priv = chip;
|
||||
mtd->owner = THIS_MODULE;
|
||||
mtd->dev.parent = &pdev->dev;
|
||||
@@ -908,9 +908,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
mtd->name = "nxp_lpc3220_slc";
|
||||
ppdata.of_node = pdev->dev.of_node;
|
||||
res = mtd_device_parse_register(mtd, NULL, &ppdata, host->ncfg->parts,
|
||||
host->ncfg->num_parts);
|
||||
res = mtd_device_register(mtd, host->ncfg->parts,
|
||||
host->ncfg->num_parts);
|
||||
if (!res)
|
||||
return res;
|
||||
|
||||
|
Reference in New Issue
Block a user