diff options
Diffstat (limited to 'drivers/mtd/devices/doc2001plus.c')
-rw-r--r-- | drivers/mtd/devices/doc2001plus.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c index ed47bafb2ce2..0595cc7324b2 100644 --- a/drivers/mtd/devices/doc2001plus.c +++ b/drivers/mtd/devices/doc2001plus.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * (c) 1999 Machine Vision Holdings, Inc. | 6 | * (c) 1999 Machine Vision Holdings, Inc. |
7 | * (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org> | 7 | * (c) 1999, 2000 David Woodhouse <dwmw2@infradead.org> |
8 | * | 8 | * |
9 | * $Id: doc2001plus.c,v 1.13 2005/01/05 18:05:12 dwmw2 Exp $ | 9 | * $Id: doc2001plus.c,v 1.14 2005/11/07 11:14:24 gleixner Exp $ |
10 | * | 10 | * |
11 | * Released under GPL | 11 | * Released under GPL |
12 | */ | 12 | */ |
@@ -293,10 +293,10 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip) | |||
293 | DoC_Command(docptr, NAND_CMD_RESET, 0); | 293 | DoC_Command(docptr, NAND_CMD_RESET, 0); |
294 | DoC_WaitReady(docptr); | 294 | DoC_WaitReady(docptr); |
295 | 295 | ||
296 | /* Read the NAND chip ID: 1. Send ReadID command */ | 296 | /* Read the NAND chip ID: 1. Send ReadID command */ |
297 | DoC_Command(docptr, NAND_CMD_READID, 0); | 297 | DoC_Command(docptr, NAND_CMD_READID, 0); |
298 | 298 | ||
299 | /* Read the NAND chip ID: 2. Send address byte zero */ | 299 | /* Read the NAND chip ID: 2. Send address byte zero */ |
300 | DoC_Address(doc, 1, 0x00, 0, 0x00); | 300 | DoC_Address(doc, 1, 0x00, 0, 0x00); |
301 | 301 | ||
302 | WriteDOC(0, docptr, Mplus_FlashControl); | 302 | WriteDOC(0, docptr, Mplus_FlashControl); |
@@ -365,7 +365,7 @@ static void DoC_ScanChips(struct DiskOnChip *this) | |||
365 | this->interleave = 1; | 365 | this->interleave = 1; |
366 | 366 | ||
367 | /* Check the ASIC agrees */ | 367 | /* Check the ASIC agrees */ |
368 | if ( (this->interleave << 2) != | 368 | if ( (this->interleave << 2) != |
369 | (ReadDOC(this->virtadr, Mplus_Configuration) & 4)) { | 369 | (ReadDOC(this->virtadr, Mplus_Configuration) & 4)) { |
370 | u_char conf = ReadDOC(this->virtadr, Mplus_Configuration); | 370 | u_char conf = ReadDOC(this->virtadr, Mplus_Configuration); |
371 | printk(KERN_NOTICE "Setting DiskOnChip Millennium Plus interleave to %s\n", | 371 | printk(KERN_NOTICE "Setting DiskOnChip Millennium Plus interleave to %s\n", |
@@ -398,7 +398,7 @@ static void DoC_ScanChips(struct DiskOnChip *this) | |||
398 | return; | 398 | return; |
399 | } | 399 | } |
400 | 400 | ||
401 | /* Fill out the chip array with {floor, chipno} for each | 401 | /* Fill out the chip array with {floor, chipno} for each |
402 | * detected chip in the device. */ | 402 | * detected chip in the device. */ |
403 | for (floor = 0, ret = 0; floor < MAX_FLOORS_MPLUS; floor++) { | 403 | for (floor = 0, ret = 0; floor < MAX_FLOORS_MPLUS; floor++) { |
404 | for (chip = 0 ; chip < numchips[floor] ; chip++) { | 404 | for (chip = 0 ; chip < numchips[floor] ; chip++) { |
@@ -432,7 +432,7 @@ static int DoCMilPlus_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2) | |||
432 | tmp2 = ReadDOC(doc2->virtadr, Mplus_AliasResolution); | 432 | tmp2 = ReadDOC(doc2->virtadr, Mplus_AliasResolution); |
433 | if (tmp1 != tmp2) | 433 | if (tmp1 != tmp2) |
434 | return 0; | 434 | return 0; |
435 | 435 | ||
436 | WriteDOC((tmp1+1) % 0xff, doc1->virtadr, Mplus_AliasResolution); | 436 | WriteDOC((tmp1+1) % 0xff, doc1->virtadr, Mplus_AliasResolution); |
437 | tmp2 = ReadDOC(doc2->virtadr, Mplus_AliasResolution); | 437 | tmp2 = ReadDOC(doc2->virtadr, Mplus_AliasResolution); |
438 | if (tmp2 == (tmp1+1) % 0xff) | 438 | if (tmp2 == (tmp1+1) % 0xff) |
@@ -624,7 +624,7 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len, | |||
624 | return -EINVAL; | 624 | return -EINVAL; |
625 | 625 | ||
626 | /* Don't allow a single read to cross a 512-byte block boundary */ | 626 | /* Don't allow a single read to cross a 512-byte block boundary */ |
627 | if (from + len > ((from | 0x1ff) + 1)) | 627 | if (from + len > ((from | 0x1ff) + 1)) |
628 | len = ((from | 0x1ff) + 1) - from; | 628 | len = ((from | 0x1ff) + 1) - from; |
629 | 629 | ||
630 | DoC_CheckASIC(docptr); | 630 | DoC_CheckASIC(docptr); |
@@ -1066,7 +1066,7 @@ int doc_erase(struct mtd_info *mtd, struct erase_info *instr) | |||
1066 | 1066 | ||
1067 | DoC_CheckASIC(docptr); | 1067 | DoC_CheckASIC(docptr); |
1068 | 1068 | ||
1069 | if (len != mtd->erasesize) | 1069 | if (len != mtd->erasesize) |
1070 | printk(KERN_WARNING "MTD: Erase not right size (%x != %x)n", | 1070 | printk(KERN_WARNING "MTD: Erase not right size (%x != %x)n", |
1071 | len, mtd->erasesize); | 1071 | len, mtd->erasesize); |
1072 | 1072 | ||
@@ -1136,9 +1136,9 @@ static void __exit cleanup_doc2001plus(void) | |||
1136 | while ((mtd=docmilpluslist)) { | 1136 | while ((mtd=docmilpluslist)) { |
1137 | this = mtd->priv; | 1137 | this = mtd->priv; |
1138 | docmilpluslist = this->nextdoc; | 1138 | docmilpluslist = this->nextdoc; |
1139 | 1139 | ||
1140 | del_mtd_device(mtd); | 1140 | del_mtd_device(mtd); |
1141 | 1141 | ||
1142 | iounmap(this->virtadr); | 1142 | iounmap(this->virtadr); |
1143 | kfree(this->chips); | 1143 | kfree(this->chips); |
1144 | kfree(mtd); | 1144 | kfree(mtd); |