mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-21 10:01:00 +00:00
Code Issues Releases Wiki Activity

mtd: nand: fsl_elbc: use the mtd instance embedded in struct nand_chip

Browse source 
struct nand_chip now embeds an mtd device. Make use of this mtd instance.

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:02 +01:00 committed by Brian Norris
parent 5d07379681
commit 18ba50c3c0
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/mtd/nand/fsl_elbc_nand.c
View file

@ -48,7 +48,6 @@
/* mtd information per set */ /* mtd information per set */
struct fsl_elbc_mtd { struct fsl_elbc_mtd {
struct mtd_info mtd;
struct nand_chip chip; struct nand_chip chip;
struct fsl_lbc_ctrl *ctrl; struct fsl_lbc_ctrl *ctrl;
@ -742,12 +741,13 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
struct fsl_lbc_regs __iomem *lbc = ctrl->regs; struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = ctrl->nand; struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = ctrl->nand;
struct nand_chip *chip = &priv->chip; struct nand_chip *chip = &priv->chip;
struct mtd_info *mtd = nand_to_mtd(chip);
dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank); dev_dbg(priv->dev, "eLBC Set Information for bank %d\n", priv->bank);
/* Fill in fsl_elbc_mtd structure */ /* Fill in fsl_elbc_mtd structure */
priv->mtd.priv = chip; mtd->priv = chip;
priv->mtd.dev.parent = priv->dev; mtd->dev.parent = priv->dev;
nand_set_flash_node(chip, priv->dev->of_node); nand_set_flash_node(chip, priv->dev->of_node);
/* set timeout to maximum */ /* set timeout to maximum */
@ -798,9 +798,11 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)
static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv) static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv)
{ {
struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = priv->ctrl->nand; struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = priv->ctrl->nand;
nand_release(&priv->mtd); struct mtd_info *mtd = nand_to_mtd(&priv->chip);
kfree(priv->mtd.name); nand_release(mtd);
kfree(mtd->name);
if (priv->vbase) if (priv->vbase)
iounmap(priv->vbase); iounmap(priv->vbase);
@ -824,6 +826,7 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev)
int bank; int bank;
struct device *dev; struct device *dev;
struct device_node *node = pdev->dev.of_node; struct device_node *node = pdev->dev.of_node;
struct mtd_info *mtd;
if (!fsl_lbc_ctrl_dev || !fsl_lbc_ctrl_dev->regs) if (!fsl_lbc_ctrl_dev || !fsl_lbc_ctrl_dev->regs)
return -ENODEV; return -ENODEV;
@ -886,8 +889,9 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev)
goto err; goto err;
} }
priv->mtd.name = kasprintf(GFP_KERNEL, "%llx.flash", (u64)res.start); mtd = nand_to_mtd(&priv->chip);
if (!priv->mtd.name) { mtd->name = kasprintf(GFP_KERNEL, "%llx.flash", (u64)res.start);
if (!nand_to_mtd(&priv->chip)->name) {
ret = -ENOMEM; ret = -ENOMEM;
goto err; goto err;
} }
@ -896,21 +900,21 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err; goto err;
ret = nand_scan_ident(&priv->mtd, 1, NULL); ret = nand_scan_ident(mtd, 1, NULL);
if (ret) if (ret)
goto err; goto err;
ret = fsl_elbc_chip_init_tail(&priv->mtd); ret = fsl_elbc_chip_init_tail(mtd);
if (ret) if (ret)
goto err; goto err;
ret = nand_scan_tail(&priv->mtd); ret = nand_scan_tail(mtd);
if (ret) if (ret)
goto err; goto err;
/* First look for RedBoot table or partitions on the command /* First look for RedBoot table or partitions on the command
* line, these take precedence over device tree information */ * line, these take precedence over device tree information */
mtd_device_parse_register(&priv->mtd, part_probe_types, NULL, mtd_device_parse_register(mtd, part_probe_types, NULL,
NULL, 0); NULL, 0);
printk(KERN_INFO "eLBC NAND device at 0x%llx, bank %d\n", printk(KERN_INFO "eLBC NAND device at 0x%llx, bank %d\n",