powerpc: MPC8541CDS: Remove macro CONFIG_MPC8541CDS

[u-boot] / drivers / mtd / nand / nand_util.c

diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index 90bf798ac00b14a769ff0aae1b30eab523ad32c4..9c8a37397013d7e3cd482c9deeed612788f82dc6 100644 (file)
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -26,7 +26,7 @@
 #include <memalign.h>
 #include <div64.h>
 
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #include <nand.h>
 #include <jffs2/jffs2.h>
@@ -59,7 +59,7 @@ int nand_erase_opts(struct mtd_info *mtd,
        int percent_complete = -1;
        const char *mtd_device = mtd->name;
        struct mtd_oob_ops oob_opts;
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
        if ((opts->offset & (mtd->erasesize - 1)) != 0) {
                printf("Attempt to erase non block-aligned data\n");
@@ -217,7 +217,7 @@ int nand_lock(struct mtd_info *mtd, int tight)
 {
        int ret = 0;
        int status;
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
        /* select the NAND device */
        chip->select_chip(mtd, 0);
@@ -267,7 +267,7 @@ int nand_get_lock_status(struct mtd_info *mtd, loff_t offset)
        int ret = 0;
        int chipnr;
        int page;
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
        /* select the NAND device */
        chipnr = (int)(offset >> chip->chip_shift);
@@ -314,7 +314,7 @@ int nand_unlock(struct mtd_info *mtd, loff_t start, size_t length,
        int chipnr;
        int status;
        int page;
-       struct nand_chip *chip = mtd->priv;
+       struct nand_chip *chip = mtd_to_nand(mtd);
 
        debug("nand_unlock%s: start: %08llx, length: %zd!\n",
                allexcept ? " (allexcept)" : "", start, length);
@@ -820,7 +820,7 @@ int nand_torture(struct mtd_info *mtd, loff_t offset)
 {
        u_char patterns[] = {0xa5, 0x5a, 0x00};
        struct erase_info instr = {
-               .mtd = nand,
+               .mtd = mtd,
                .addr = offset,
                .len = mtd->erasesize,
        };
@@ -847,7 +847,7 @@ int nand_torture(struct mtd_info *mtd, loff_t offset)
        }
 
        for (i = 0; i < patt_count; i++) {
-               err = mtd->erase(mtd, &instr);
+               err = mtd_erase(mtd, &instr);
                if (err) {
                        printf("%s: erase() failed for block at 0x%llx: %d\n",
                                mtd->name, instr.addr, err);
@@ -855,7 +855,7 @@ int nand_torture(struct mtd_info *mtd, loff_t offset)
                }
 
                /* Make sure the block contains only 0xff bytes */
-               err = mtd->read(mtd, offset, mtd->erasesize, &retlen, buf);
+               err = mtd_read(mtd, offset, mtd->erasesize, &retlen, buf);
                if ((err && err != -EUCLEAN) || retlen != mtd->erasesize) {
                        printf("%s: read() failed for block at 0x%llx: %d\n",
                                mtd->name, instr.addr, err);
@@ -872,14 +872,14 @@ int nand_torture(struct mtd_info *mtd, loff_t offset)
 
                /* Write a pattern and check it */
                memset(buf, patterns[i], mtd->erasesize);
-               err = mtd->write(mtd, offset, mtd->erasesize, &retlen, buf);
+               err = mtd_write(mtd, offset, mtd->erasesize, &retlen, buf);
                if (err || retlen != mtd->erasesize) {
                        printf("%s: write() failed for block at 0x%llx: %d\n",
                                mtd->name, instr.addr, err);
                        goto out;
                }
 
-               err = mtd->read(mtd, offset, mtd->erasesize, &retlen, buf);
+               err = mtd_read(mtd, offset, mtd->erasesize, &retlen, buf);
                if ((err && err != -EUCLEAN) || retlen != mtd->erasesize) {
                        printf("%s: read() failed for block at 0x%llx: %d\n",
                                mtd->name, instr.addr, err);