aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/diskonchip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2005-01-31 17:21:18 -0500
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-05-23 06:17:42 -0400
commit39605398cd45941b4ed2026c666a1a9f39c40490 (patch)
treecd261f8ce41cd5e0a5871f4bae2187577d60881b /drivers/mtd/nand/diskonchip.c
parent651078ba3a9225ab3fbef146359390ac498ff9fe (diff)
[MTD] DiskOnChip code cleanup
Remove commented ugliness Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/mtd/nand/diskonchip.c')
-rw-r--r--drivers/mtd/nand/diskonchip.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index 5a586707eedc..392240120304 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -16,7 +16,7 @@
16 * 16 *
17 * Interface to generic NAND code for M-Systems DiskOnChip devices 17 * Interface to generic NAND code for M-Systems DiskOnChip devices
18 * 18 *
19 * $Id: diskonchip.c,v 1.46 2005/01/31 20:36:42 gleixner Exp $ 19 * $Id: diskonchip.c,v 1.47 2005/01/31 22:21:15 gleixner Exp $
20 */ 20 */
21 21
22#include <linux/kernel.h> 22#include <linux/kernel.h>
@@ -1122,8 +1122,6 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,
1122 if (!(numheaders=find_media_headers(mtd, buf, "ANAND", 1))) goto out; 1122 if (!(numheaders=find_media_headers(mtd, buf, "ANAND", 1))) goto out;
1123 mh = (struct NFTLMediaHeader *) buf; 1123 mh = (struct NFTLMediaHeader *) buf;
1124 1124
1125//#ifdef CONFIG_MTD_DEBUG_VERBOSE
1126// if (CONFIG_MTD_DEBUG_VERBOSE >= 2)
1127 printk(KERN_INFO " DataOrgID = %s\n" 1125 printk(KERN_INFO " DataOrgID = %s\n"
1128 " NumEraseUnits = %d\n" 1126 " NumEraseUnits = %d\n"
1129 " FirstPhysicalEUN = %d\n" 1127 " FirstPhysicalEUN = %d\n"
@@ -1132,7 +1130,6 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,
1132 mh->DataOrgID, mh->NumEraseUnits, 1130 mh->DataOrgID, mh->NumEraseUnits,
1133 mh->FirstPhysicalEUN, mh->FormattedSize, 1131 mh->FirstPhysicalEUN, mh->FormattedSize,
1134 mh->UnitSizeFactor); 1132 mh->UnitSizeFactor);
1135//#endif
1136 1133
1137 blocks = mtd->size >> this->phys_erase_shift; 1134 blocks = mtd->size >> this->phys_erase_shift;
1138 maxblocks = min(32768U, mtd->erasesize - psize); 1135 maxblocks = min(32768U, mtd->erasesize - psize);
@@ -1175,10 +1172,6 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,
1175 offs <<= this->page_shift; 1172 offs <<= this->page_shift;
1176 offs += mtd->erasesize; 1173 offs += mtd->erasesize;
1177 1174
1178 //parts[0].name = " DiskOnChip Boot / Media Header partition";
1179 //parts[0].offset = 0;
1180 //parts[0].size = offs;
1181
1182 parts[0].name = " DiskOnChip BDTL partition"; 1175 parts[0].name = " DiskOnChip BDTL partition";
1183 parts[0].offset = offs; 1176 parts[0].offset = offs;
1184 parts[0].size = (mh->NumEraseUnits - numheaders) << this->bbt_erase_shift; 1177 parts[0].size = (mh->NumEraseUnits - numheaders) << this->bbt_erase_shift;
@@ -1233,8 +1226,6 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,
1233 mh->FormatFlags = le32_to_cpu(mh->FormatFlags); 1226 mh->FormatFlags = le32_to_cpu(mh->FormatFlags);
1234 mh->PercentUsed = le32_to_cpu(mh->PercentUsed); 1227 mh->PercentUsed = le32_to_cpu(mh->PercentUsed);
1235 1228
1236//#ifdef CONFIG_MTD_DEBUG_VERBOSE
1237// if (CONFIG_MTD_DEBUG_VERBOSE >= 2)
1238 printk(KERN_INFO " bootRecordID = %s\n" 1229 printk(KERN_INFO " bootRecordID = %s\n"
1239 " NoOfBootImageBlocks = %d\n" 1230 " NoOfBootImageBlocks = %d\n"
1240 " NoOfBinaryPartitions = %d\n" 1231 " NoOfBinaryPartitions = %d\n"
@@ -1252,7 +1243,6 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,
1252 ((unsigned char *) &mh->OsakVersion)[2] & 0xf, 1243 ((unsigned char *) &mh->OsakVersion)[2] & 0xf,
1253 ((unsigned char *) &mh->OsakVersion)[3] & 0xf, 1244 ((unsigned char *) &mh->OsakVersion)[3] & 0xf,
1254 mh->PercentUsed); 1245 mh->PercentUsed);
1255//#endif
1256 1246
1257 vshift = this->phys_erase_shift + mh->BlockMultiplierBits; 1247 vshift = this->phys_erase_shift + mh->BlockMultiplierBits;
1258 1248
@@ -1278,8 +1268,6 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,
1278 ip->spareUnits = le32_to_cpu(ip->spareUnits); 1268 ip->spareUnits = le32_to_cpu(ip->spareUnits);
1279 ip->Reserved0 = le32_to_cpu(ip->Reserved0); 1269 ip->Reserved0 = le32_to_cpu(ip->Reserved0);
1280 1270
1281//#ifdef CONFIG_MTD_DEBUG_VERBOSE
1282// if (CONFIG_MTD_DEBUG_VERBOSE >= 2)
1283 printk(KERN_INFO " PARTITION[%d] ->\n" 1271 printk(KERN_INFO " PARTITION[%d] ->\n"
1284 " virtualUnits = %d\n" 1272 " virtualUnits = %d\n"
1285 " firstUnit = %d\n" 1273 " firstUnit = %d\n"
@@ -1289,16 +1277,15 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,
1289 i, ip->virtualUnits, ip->firstUnit, 1277 i, ip->virtualUnits, ip->firstUnit,
1290 ip->lastUnit, ip->flags, 1278 ip->lastUnit, ip->flags,
1291 ip->spareUnits); 1279 ip->spareUnits);
1292//#endif
1293 1280
1294/* 1281#if 0
1295 if ((i == 0) && (ip->firstUnit > 0)) { 1282 if ((i == 0) && (ip->firstUnit > 0)) {
1296 parts[0].name = " DiskOnChip IPL / Media Header partition"; 1283 parts[0].name = " DiskOnChip IPL / Media Header partition";
1297 parts[0].offset = 0; 1284 parts[0].offset = 0;
1298 parts[0].size = mtd->erasesize * ip->firstUnit; 1285 parts[0].size = mtd->erasesize * ip->firstUnit;
1299 numparts = 1; 1286 numparts = 1;
1300 } 1287 }
1301*/ 1288#endif
1302 1289
1303 if (ip->flags & INFTL_BINARY) 1290 if (ip->flags & INFTL_BINARY)
1304 parts[numparts].name = " DiskOnChip BDK partition"; 1291 parts[numparts].name = " DiskOnChip BDK partition";