cfi_flash: Fix logical continuations

[oweals/u-boot.git] / drivers / mtd / nand / fsmc_nand.c

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index e0e9e1ebd03104715c78a483a2cb0cb98fdd45fe..d5d105629369a5ae0def96fc3227e774c09a03ea 100644 (file)
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -165,7 +165,7 @@ static int count_written_bits(uint8_t *buff, int size, int max_bits)
 
 static void fsmc_nand_hwcontrol(struct mtd_info *mtd, int cmd, uint ctrl)
 {
-       struct nand_chip *this = mtd->priv;
+       struct nand_chip *this = mtd_to_nand(mtd);
        ulong IO_ADDR_W;
 
        if (ctrl & NAND_CTRL_CHANGE) {
@@ -409,8 +409,8 @@ int fsmc_nand_switch_ecc(uint32_t eccstrength)
         * Nomadik SoC is currently supporting this fsmc_nand_switch_ecc()
         * function, as it doesn't need to switch to a different ECC layout.
         */
-       mtd = &nand_info[nand_curr_device];
-       nand = mtd->priv;
+       mtd = get_nand_dev_by_index(nand_curr_device);
+       nand = mtd_to_nand(mtd);
 
        /* Setup the ecc configurations again */
        if (eccstrength == 1) {
@@ -443,7 +443,6 @@ int fsmc_nand_init(struct nand_chip *nand)
 {
        static int chip_nr;
        struct mtd_info *mtd;
-       int i;
        u32 peripid2 = readl(&fsmc_regs_p->peripid2);
 
        fsmc_version = (peripid2 >> FSMC_REVISION_SHFT) &
@@ -480,8 +479,7 @@ int fsmc_nand_init(struct nand_chip *nand)
                (void  __iomem *)CONFIG_SYS_NAND_BASE;
        nand->badblockbits = 7;
 
-       mtd = &nand_info[chip_nr++];
-       mtd->priv = nand;
+       mtd = nand_to_mtd(nand);
 
        switch (fsmc_version) {
        case FSMC_VER8:
@@ -514,9 +512,8 @@ int fsmc_nand_init(struct nand_chip *nand)
        if (nand_scan_tail(mtd))
                return -ENXIO;
 
-       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-               if (nand_register(i))
-                       return -ENXIO;
+       if (nand_register(chip_nr++, mtd))
+               return -ENXIO;
 
        return 0;
 }