mtd: nand: fix for drop unnecessary partition parser data

[cascardo/linux.git] / drivers / mtd / nand / ndfc.c

diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 4f0d62f..7d72f4f 100644 (file)
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -37,7 +37,6 @@
 struct ndfc_controller {
        struct platform_device *ofdev;
        void __iomem *ndfcbase;
-       struct mtd_info mtd;
        struct nand_chip chip;
        int chip_select;
        struct nand_hw_control ndfc_control;
@@ -48,7 +47,7 @@ static struct ndfc_controller ndfc_ctrl[NDFC_MAX_CS];
 static void ndfc_select_chip(struct mtd_info *mtd, int chip)
 {
        uint32_t ccr;
-       struct nand_chip *nchip = mtd->priv;
+       struct nand_chip *nchip = mtd_to_nand(mtd);
        struct ndfc_controller *ndfc = nchip->priv;
 
        ccr = in_be32(ndfc->ndfcbase + NDFC_CCR);
@@ -62,7 +61,7 @@ static void ndfc_select_chip(struct mtd_info *mtd, int chip)
 
 static void ndfc_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
        struct ndfc_controller *ndfc = chip->priv;
 
        if (cmd == NAND_CMD_NONE)
@@ -76,7 +75,7 @@ static void ndfc_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 
 static int ndfc_ready(struct mtd_info *mtd)
 {
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
        struct ndfc_controller *ndfc = chip->priv;
 
        return in_be32(ndfc->ndfcbase + NDFC_STAT) & NDFC_STAT_IS_READY;
@@ -85,7 +84,7 @@ static int ndfc_ready(struct mtd_info *mtd)
 static void ndfc_enable_hwecc(struct mtd_info *mtd, int mode)
 {
        uint32_t ccr;
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
        struct ndfc_controller *ndfc = chip->priv;
 
        ccr = in_be32(ndfc->ndfcbase + NDFC_CCR);
@@ -97,7 +96,7 @@ static void ndfc_enable_hwecc(struct mtd_info *mtd, int mode)
 static int ndfc_calculate_ecc(struct mtd_info *mtd,
                              const u_char *dat, u_char *ecc_code)
 {
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
        struct ndfc_controller *ndfc = chip->priv;
        uint32_t ecc;
        uint8_t *p = (uint8_t *)&ecc;
@@ -121,7 +120,7 @@ static int ndfc_calculate_ecc(struct mtd_info *mtd,
  */
 static void ndfc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
 {
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
        struct ndfc_controller *ndfc = chip->priv;
        uint32_t *p = (uint32_t *) buf;
 
@@ -131,7 +130,7 @@ static void ndfc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
 
 static void ndfc_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
        struct ndfc_controller *ndfc = chip->priv;
        uint32_t *p = (uint32_t *) buf;
 
@@ -147,7 +146,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
 {
        struct device_node *flash_np;
        struct nand_chip *chip = &ndfc->chip;
-       struct mtd_part_parser_data ppdata;
+       struct mtd_info *mtd = nand_to_mtd(chip);
        int ret;
 
        chip->IO_ADDR_R = ndfc->ndfcbase + NDFC_DATA;
@@ -168,31 +167,30 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
        chip->ecc.strength = 1;
        chip->priv = ndfc;
 
-       ndfc->mtd.priv = chip;
-       ndfc->mtd.dev.parent = &ndfc->ofdev->dev;
+       mtd->dev.parent = &ndfc->ofdev->dev;
 
        flash_np = of_get_next_child(node, NULL);
        if (!flash_np)
                return -ENODEV;
+       nand_set_flash_node(chip, flash_np);
 
-       ppdata.of_node = flash_np;
-       ndfc->mtd.name = kasprintf(GFP_KERNEL, "%s.%s",
-                       dev_name(&ndfc->ofdev->dev), flash_np->name);
-       if (!ndfc->mtd.name) {
+       mtd->name = kasprintf(GFP_KERNEL, "%s.%s", dev_name(&ndfc->ofdev->dev),
+                             flash_np->name);
+       if (!mtd->name) {
                ret = -ENOMEM;
                goto err;
        }
 
-       ret = nand_scan(&ndfc->mtd, 1);
+       ret = nand_scan(mtd, 1);
        if (ret)
                goto err;
 
-       ret = mtd_device_parse_register(&ndfc->mtd, NULL, &ppdata, NULL, 0);
+       ret = mtd_device_register(mtd, NULL, 0);
 
 err:
        of_node_put(flash_np);
        if (ret)
-               kfree(ndfc->mtd.name);
+               kfree(mtd->name);
        return ret;
 }
 
@@ -259,9 +257,10 @@ static int ndfc_probe(struct platform_device *ofdev)
 static int ndfc_remove(struct platform_device *ofdev)
 {
        struct ndfc_controller *ndfc = dev_get_drvdata(&ofdev->dev);
+       struct mtd_info *mtd = nand_to_mtd(&ndfc->chip);
 
-       nand_release(&ndfc->mtd);
-       kfree(ndfc->mtd.name);
+       nand_release(mtd);
+       kfree(mtd->name);
 
        return 0;
 }