Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

[yaffs2.git] / yaffs_mtdif1_single.c

diff --git a/yaffs_mtdif1_single.c b/yaffs_mtdif1_single.c
index 02281fdb3d568fe71e18fdf11ca52e401b1d50a8..51083695eb3347eea20734317ac27d2b276338e8 100644 (file)
--- a/yaffs_mtdif1_single.c
+++ b/yaffs_mtdif1_single.c
@@ -42,7 +42,6 @@
 # define YTAG1_SIZE 9
 #endif
 
-
 /* Write a chunk (page) of data to NAND.
  *
  * Caller always provides ExtendedTags data which are converted to a more
@@ -65,11 +64,12 @@
  * Returns YAFFS_OK or YAFFS_FAIL.
  */
 int nandmtd1_write_chunk_tags(struct yaffs_dev *dev,
-       int nand_chunk, const u8 *data, const struct yaffs_ext_tags *etags)
+                             int nand_chunk, const u8 * data,
+                             const struct yaffs_ext_tags *etags)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int chunk_bytes = dev->data_bytes_per_chunk;
-       loff_t addr = ((loff_t)nand_chunk) * chunk_bytes;
+       loff_t addr = ((loff_t) nand_chunk) * chunk_bytes;
        struct mtd_oob_ops ops;
        struct yaffs_packed_tags1 pt1;
        int retval;
@@ -94,11 +94,11 @@ int nandmtd1_write_chunk_tags(struct yaffs_dev *dev,
                pt1.deleted = 0;
        }
 #else
-       ((u8 *)&pt1)[8] = 0xff;
+       ((u8 *) & pt1)[8] = 0xff;
        if (etags->is_deleted) {
                memset(&pt1, 0xff, 8);
                /* zero page_status byte to indicate deleted */
-               ((u8 *)&pt1)[8] = 0;
+               ((u8 *) & pt1)[8] = 0;
        }
 #endif
 
@@ -106,14 +106,14 @@ int nandmtd1_write_chunk_tags(struct yaffs_dev *dev,
        ops.mode = MTD_OOB_AUTO;
        ops.len = (data) ? chunk_bytes : 0;
        ops.ooblen = YTAG1_SIZE;
-       ops.datbuf = (u8 *)data;
-       ops.oobbuf = (u8 *)&pt1;
+       ops.datbuf = (u8 *) data;
+       ops.oobbuf = (u8 *) & pt1;
 
        retval = mtd->write_oob(mtd, addr, &ops);
        if (retval) {
-               T(YAFFS_TRACE_MTD,
-                       (TSTR("write_oob failed, chunk %d, mtd error %d"TENDSTR),
-                       nand_chunk, retval));
+               yaffs_trace(YAFFS_TRACE_MTD,
+                       "write_oob failed, chunk %d, mtd error %d",
+                       nand_chunk, retval);
        }
        return retval ? YAFFS_FAIL : YAFFS_OK;
 }
@@ -143,11 +143,12 @@ static int rettags(struct yaffs_ext_tags *etags, int ecc_result, int retval)
  * Returns YAFFS_OK or YAFFS_FAIL.
  */
 int nandmtd1_read_chunk_tags(struct yaffs_dev *dev,
-       int nand_chunk, u8 *data, struct yaffs_ext_tags *etags)
+                            int nand_chunk, u8 * data,
+                            struct yaffs_ext_tags *etags)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int chunk_bytes = dev->data_bytes_per_chunk;
-       loff_t addr = ((loff_t)nand_chunk) * chunk_bytes;
+       loff_t addr = ((loff_t) nand_chunk) * chunk_bytes;
        int eccres = YAFFS_ECC_RESULT_NO_ERROR;
        struct mtd_oob_ops ops;
        struct yaffs_packed_tags1 pt1;
@@ -159,16 +160,16 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev,
        ops.len = (data) ? chunk_bytes : 0;
        ops.ooblen = YTAG1_SIZE;
        ops.datbuf = data;
-       ops.oobbuf = (u8 *)&pt1;
+       ops.oobbuf = (u8 *) & pt1;
 
        /* Read page and oob using MTD.
         * Check status and determine ECC result.
         */
        retval = mtd->read_oob(mtd, addr, &ops);
        if (retval) {
-               T(YAFFS_TRACE_MTD,
-                       (TSTR("read_oob failed, chunk %d, mtd error %d"TENDSTR),
-                       nand_chunk, retval));
+               yaffs_trace(YAFFS_TRACE_MTD,
+                       "read_oob failed, chunk %d, mtd error %d",
+                       nand_chunk, retval);
        }
 
        switch (retval) {
@@ -188,17 +189,16 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev,
                /* fall into... */
        default:
                rettags(etags, YAFFS_ECC_RESULT_UNFIXED, 0);
-               etags->block_bad = (mtd->block_isbad)(mtd, addr);
+               etags->block_bad = (mtd->block_isbad) (mtd, addr);
                return YAFFS_FAIL;
        }
 
        /* Check for a blank/erased chunk.
         */
-       if (yaffs_check_ff((u8 *)&pt1, 8)) {
+       if (yaffs_check_ff((u8 *) & pt1, 8)) {
                /* when blank, upper layers want ecc_result to be <= NO_ERROR */
                return rettags(etags, YAFFS_ECC_RESULT_NO_ERROR, YAFFS_OK);
        }
-
 #ifndef CONFIG_YAFFS_9BYTE_TAGS
        /* Read deleted status (bit) then return it to it's non-deleted
         * state before performing tags mini-ECC check. pt1.deleted is
@@ -207,7 +207,7 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev,
        deleted = !pt1.deleted;
        pt1.deleted = 1;
 #else
-       deleted = (yaffs_count_bits(((u8 *)&pt1)[8]) < 7);
+       deleted = (yaffs_count_bits(((u8 *) & pt1)[8]) < 7);
 #endif
 
        /* Check the packed tags mini-ECC and correct if necessary/possible.
@@ -254,9 +254,10 @@ int nandmtd1_mark_block_bad(struct yaffs_dev *dev, int block_no)
        int blocksize = dev->param.chunks_per_block * dev->data_bytes_per_chunk;
        int retval;
 
-       T(YAFFS_TRACE_BAD_BLOCKS,(TSTR("marking block %d bad"TENDSTR), block_no));
+       yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
+               "marking block %d bad", block_no);
 
-       retval = mtd->block_markbad(mtd, (loff_t)blocksize * block_no);
+       retval = mtd->block_markbad(mtd, (loff_t) blocksize * block_no);
        return (retval) ? YAFFS_FAIL : YAFFS_OK;
 }
 
@@ -271,9 +272,9 @@ static int nandmtd1_test_prerequists(struct mtd_info *mtd)
        int oobavail = mtd->ecclayout->oobavail;
 
        if (oobavail < YTAG1_SIZE) {
-               T(YAFFS_TRACE_ERROR,
-                       (TSTR("mtd device has only %d bytes for tags, need %d"TENDSTR),
-                       oobavail, YTAG1_SIZE));
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "mtd device has only %d bytes for tags, need %d",
+                       oobavail, YTAG1_SIZE);
                return YAFFS_FAIL;
        }
        return YAFFS_OK;
@@ -289,11 +290,11 @@ static int nandmtd1_test_prerequists(struct mtd_info *mtd)
  * Always returns YAFFS_OK.
  */
 int nandmtd1_query_block(struct yaffs_dev *dev, int block_no,
-       enum yaffs_block_state *state_ptr, u32 *seq_ptr)
+                        enum yaffs_block_state *state_ptr, u32 * seq_ptr)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int chunk_num = block_no * dev->param.chunks_per_block;
-       loff_t addr = (loff_t)chunk_num * dev->data_bytes_per_chunk;
+       loff_t addr = (loff_t) chunk_num * dev->data_bytes_per_chunk;
        struct yaffs_ext_tags etags;
        int state = YAFFS_BLOCK_STATE_DEAD;
        int seqnum = 0;
@@ -306,10 +307,10 @@ int nandmtd1_query_block(struct yaffs_dev *dev, int block_no,
                return YAFFS_FAIL;
 
        retval = nandmtd1_read_chunk_tags(dev, chunk_num, NULL, &etags);
-       etags.block_bad = (mtd->block_isbad)(mtd, addr);
+       etags.block_bad = (mtd->block_isbad) (mtd, addr);
        if (etags.block_bad) {
-               T(YAFFS_TRACE_BAD_BLOCKS,
-                       (TSTR("block %d is marked bad"TENDSTR), block_no));
+               yaffs_trace(YAFFS_TRACE_BAD_BLOCKS,
+                       "block %d is marked bad", block_no);
                state = YAFFS_BLOCK_STATE_DEAD;
        } else if (etags.ecc_result != YAFFS_ECC_RESULT_NO_ERROR) {
                /* bad tags, need to look more closely */