yaffs: Change all yaffs, YAFFS and Yaffs in Kconfig to yaffs

[yaffs2.git] / yaffs_mtdif2_single.c

diff --git a/yaffs_mtdif2_single.c b/yaffs_mtdif2_single.c
index 00040cd9017eb81092fdd705451abea8f4fcb57b..18340bde8ecd38de8e2a1b8613305a2bd5913395 100644 (file)
--- a/yaffs_mtdif2_single.c
+++ b/yaffs_mtdif2_single.c
@@ -15,42 +15,35 @@
 
 #include "yportenv.h"
 #include "yaffs_trace.h"
-
 #include "yaffs_mtdif2.h"
-
+#include "yaffs_packedtags2.h"
+#include "yaffs_linux.h"
 #include "linux/mtd/mtd.h"
 #include "linux/types.h"
 #include "linux/time.h"
 
-#include "yaffs_packedtags2.h"
-
-#include "yaffs_linux.h"
 
 /* NB For use with inband tags....
- * We assume that the data buffer is of size total_bytes_per_chunk so that we can also
- * use it to load the tags.
+ * We assume that the data buffer is of size total_bytes_per_chunk so that
+ * we can also use it to load the tags.
  */
 int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
-                             const u8 * data,
+                             const u8 *data,
                              const struct yaffs_ext_tags *tags)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        struct mtd_oob_ops ops;
        int retval = 0;
-
        loff_t addr;
-
        struct yaffs_packed_tags2 pt;
-
        int packed_tags_size =
            dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
        void *packed_tags_ptr =
            dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
 
-       T(YAFFS_TRACE_MTD,
-         (TSTR
-          ("nandmtd2_write_chunk_tags chunk %d data %p tags %p"
-           TENDSTR), nand_chunk, data, tags));
+       yaffs_trace(YAFFS_TRACE_MTD,
+               "nandmtd2_write_chunk_tags chunk %d data %p tags %p",
+               nand_chunk, data, tags);
 
        addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
 
@@ -62,13 +55,15 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
                BUG();
        else if (dev->param.inband_tags) {
                struct yaffs_packed_tags2_tags_only *pt2tp;
+
                pt2tp =
                    (struct yaffs_packed_tags2_tags_only *)(data +
-                                                           dev->
-                                                           data_bytes_per_chunk);
+                                                       dev->
+                                                       data_bytes_per_chunk);
                yaffs_pack_tags2_tags_only(pt2tp, tags);
-       } else
+       } else {
                yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
+       }
 
        ops.mode = MTD_OOB_AUTO;
        ops.ooblen = (dev->param.inband_tags) ? 0 : packed_tags_size;
@@ -85,28 +80,23 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 }
 
 int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
-                            u8 * data, struct yaffs_ext_tags *tags)
+                            u8 *data, struct yaffs_ext_tags *tags)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        struct mtd_oob_ops ops;
-
        size_t dummy;
        int retval = 0;
        int local_data = 0;
-
        loff_t addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
-
        struct yaffs_packed_tags2 pt;
-
        int packed_tags_size =
            dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
        void *packed_tags_ptr =
            dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
 
-       T(YAFFS_TRACE_MTD,
-         (TSTR
-          ("nandmtd2_read_chunk_tags chunk %d data %p tags %p"
-           TENDSTR), nand_chunk, data, tags));
+       yaffs_trace(YAFFS_TRACE_MTD,
+               "nandmtd2_read_chunk_tags chunk %d data %p tags %p",
+               nand_chunk, data, tags);
 
        if (dev->param.inband_tags) {
 
@@ -114,7 +104,6 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
                        local_data = 1;
                        data = yaffs_get_temp_buffer(dev, __LINE__);
                }
-
        }
 
        if (dev->param.inband_tags || (data && !tags))
@@ -134,8 +123,8 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
                if (tags) {
                        struct yaffs_packed_tags2_tags_only *pt2tp;
                        pt2tp =
-                           (struct yaffs_packed_tags2_tags_only *)&data[dev->
-                                                                        data_bytes_per_chunk];
+                               (struct yaffs_packed_tags2_tags_only *)
+                                       &data[dev->data_bytes_per_chunk];
                        yaffs_unpack_tags2_tags_only(tags, pt2tp);
                }
        } else {
@@ -170,8 +159,9 @@ int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int retval;
-       T(YAFFS_TRACE_MTD,
-         (TSTR("nandmtd2_mark_block_bad %d" TENDSTR), block_no));
+
+       yaffs_trace(YAFFS_TRACE_MTD,
+               "nandmtd2_mark_block_bad %d", block_no);
 
        retval =
            mtd->block_markbad(mtd,
@@ -182,7 +172,6 @@ int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
                return YAFFS_OK;
        else
                return YAFFS_FAIL;
-
 }
 
 int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
@@ -191,14 +180,14 @@ int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int retval;
 
-       T(YAFFS_TRACE_MTD, (TSTR("nandmtd2_query_block %d" TENDSTR), block_no));
+       yaffs_trace(YAFFS_TRACE_MTD, "nandmtd2_query_block %d", block_no);
        retval =
            mtd->block_isbad(mtd,
                             block_no * dev->param.chunks_per_block *
                             dev->param.total_bytes_per_chunk);
 
        if (retval) {
-               T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
+               yaffs_trace(YAFFS_TRACE_MTD, "block is bad");
 
                *state = YAFFS_BLOCK_STATE_DEAD;
                *seq_number = 0;
@@ -215,11 +204,12 @@ int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
                        *state = YAFFS_BLOCK_STATE_EMPTY;
                }
        }
-       T(YAFFS_TRACE_MTD,
-         (TSTR("block is bad seq %d state %d" TENDSTR), *seq_number, *state));
+       yaffs_trace(YAFFS_TRACE_MTD,
+               "block is bad seq %d state %d", *seq_number, *state);
 
        if (retval == 0)
                return YAFFS_OK;
        else
                return YAFFS_FAIL;
 }
+