Merge remote branch 'origin/master'

[yaffs2.git] / direct / u-boot / fs / yaffs2 / yaffs_mtdif2.c

diff --git a/direct/u-boot/fs/yaffs2/yaffs_mtdif2.c b/direct/u-boot/fs/yaffs2/yaffs_mtdif2.c
index 4d968722161805a433f737cce54cde56f2c4c4e2..e4d7f6b2e1376c186eb32dffcfb93e790fe61ff9 100644 (file)
--- a/direct/u-boot/fs/yaffs2/yaffs_mtdif2.c
+++ b/direct/u-boot/fs/yaffs2/yaffs_mtdif2.c
@@ -234,7 +234,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_dev *dev, int blockNo)
 }
 
 int nandmtd2_QueryNANDBlock(struct yaffs_dev *dev, int blockNo,
-                           enum yaffs_block_state * state, u32 *sequenceNumber)
+                           enum yaffs_block_state *state, u32 *sequenceNumber)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->driver_context);
        int retval;
@@ -253,9 +253,9 @@ int nandmtd2_QueryNANDBlock(struct yaffs_dev *dev, int blockNo,
        } else {
                struct yaffs_ext_tags t;
                nandmtd2_read_chunk_tags(dev,
-                                                  blockNo *
-                                                  dev->param.chunks_per_block, NULL,
-                                                  &t);
+                                          blockNo *
+                                          dev->param.chunks_per_block, NULL,
+                                          &t);
 
                if (t.chunk_used) {
                        *sequenceNumber = t.seq_number;
@@ -265,7 +265,8 @@ int nandmtd2_QueryNANDBlock(struct yaffs_dev *dev, int blockNo,
                        *state = YAFFS_BLOCK_STATE_EMPTY;
                }
        }
-       yaffs_trace(YAFFS_TRACE_MTD, "block is bad seq %d state %d", *sequenceNumber, *state);
+       yaffs_trace(YAFFS_TRACE_MTD, "block is bad seq %d state %d",
+                       *sequenceNumber, *state);
 
        if (retval == 0)
                return YAFFS_OK;