Major whitespace/style changes to match Linux checkpatch.pl code style

[yaffs2.git] / yaffs_mtdif2.c

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 6ed89c24a3f20f9284918f50143e11a21719cad9..77504babb78112909b235c1ead8579f233e301c5 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -14,7 +14,7 @@
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =
-    "$Id: yaffs_mtdif2.c,v 1.22 2008-11-02 22:47:13 charles Exp $";
+       "$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
 
 #include "yportenv.h"
 
@@ -31,12 +31,12 @@ const char *yaffs_mtdif2_c_version =
  * We assume that the data buffer is of size totalBytersPerChunk so that we can also
  * use it to load the tags.
  */
-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
-                                     const __u8 * data,
-                                     const yaffs_ExtendedTags * tags)
+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
+                                     const __u8 *data,
+                                     const yaffs_ExtendedTags *tags)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17))
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        struct mtd_oob_ops ops;
 #else
        size_t dummy;
@@ -51,25 +51,24 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
          (TSTR
           ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
            TENDSTR), chunkInNAND, data, tags));
-           
+
 
        addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
-       
+
        /* For yaffs2 writing there must be both data and tags.
         * If we're using inband tags, then the tags are stuffed into
         * the end of the data buffer.
         */
-       if(!data || !tags)
-               BUG();  
-       else if(dev->inbandTags){
+       if (!data || !tags)
+               BUG();
+       else if (dev->inbandTags) {
                yaffs_PackedTags2TagsPart *pt2tp;
                pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
-               yaffs_PackTags2TagsPart(pt2tp,tags);
-       }
-       else
+               yaffs_PackTags2TagsPart(pt2tp, tags);
+       } else
                yaffs_PackTags2(&pt, tags);
-       
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
        ops.mode = MTD_OOB_AUTO;
        ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
        ops.len = dev->totalBytesPerChunk;
@@ -82,7 +81,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
        if (!dev->inbandTags) {
                retval =
                    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-                                  &dummy, data, (__u8 *) & pt, NULL);
+                                  &dummy, data, (__u8 *) &pt, NULL);
        } else {
                retval =
                    mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
@@ -96,11 +95,11 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
                return YAFFS_FAIL;
 }
 
-int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-                                      __u8 * data, yaffs_ExtendedTags * tags)
+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
+                                      __u8 *data, yaffs_ExtendedTags *tags)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17))
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        struct mtd_oob_ops ops;
 #endif
        size_t dummy;
@@ -115,19 +114,19 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
          (TSTR
           ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
            TENDSTR), chunkInNAND, data, tags));
-           
-       if(dev->inbandTags){
-               
-               if(!data) {
+
+       if (dev->inbandTags) {
+
+               if (!data) {
                        localData = 1;
-                       data = yaffs_GetTempBuffer(dev,__LINE__);
+                       data = yaffs_GetTempBuffer(dev, __LINE__);
                }
-               
+
 
        }
 
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
        if (dev->inbandTags || (data && !tags))
                retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
                                &dummy, data);
@@ -159,25 +158,24 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
 #endif
 
 
-       if(dev->inbandTags){
-               if(tags){
-                       yaffs_PackedTags2TagsPart * pt2tp;
-                       pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];    
-                       yaffs_UnpackTags2TagsPart(tags,pt2tp);
+       if (dev->inbandTags) {
+               if (tags) {
+                       yaffs_PackedTags2TagsPart *pt2tp;
+                       pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
+                       yaffs_UnpackTags2TagsPart(tags, pt2tp);
                }
-       }
-       else {
-               if (tags){
+       } else {
+               if (tags) {
                        memcpy(&pt, dev->spareBuffer, sizeof(pt));
                        yaffs_UnpackTags2(tags, &pt);
                }
        }
 
-       if(localData)
-               yaffs_ReleaseTempBuffer(dev,data,__LINE__);
-       
-       if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-               tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;             
+       if (localData)
+               yaffs_ReleaseTempBuffer(dev, data, __LINE__);
+
+       if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+               tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
        if (retval == 0)
                return YAFFS_OK;
        else
@@ -204,7 +202,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 }
 
 int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-                           yaffs_BlockState * state, __u32 *sequenceNumber)
+                           yaffs_BlockState *state, __u32 *sequenceNumber)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        int retval;