aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/onenand
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/onenand')
-rw-r--r--drivers/mtd/onenand/onenand_base.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 99de2f055eb1..cc38fa0d45c6 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -255,7 +255,7 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
255 /* Write 'BSA, BSC' of DataRAM */ 255 /* Write 'BSA, BSC' of DataRAM */
256 value = onenand_buffer_address(dataram, sectors, count); 256 value = onenand_buffer_address(dataram, sectors, count);
257 this->write_word(value, this->base + ONENAND_REG_START_BUFFER); 257 this->write_word(value, this->base + ONENAND_REG_START_BUFFER);
258 258
259 if (readcmd) { 259 if (readcmd) {
260 /* Select DataRAM for DDP */ 260 /* Select DataRAM for DDP */
261 value = onenand_bufferram_address(this, block); 261 value = onenand_bufferram_address(this, block);
@@ -433,7 +433,7 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area,
433 * onenand_check_bufferram - [GENERIC] Check BufferRAM information 433 * onenand_check_bufferram - [GENERIC] Check BufferRAM information
434 * @param mtd MTD data structure 434 * @param mtd MTD data structure
435 * @param addr address to check 435 * @param addr address to check
436 * @return 1 if there are valid data, otherwise 0 436 * @return 1 if there are valid data, otherwise 0
437 * 437 *
438 * Check bufferram if there is data we required 438 * Check bufferram if there is data we required
439 */ 439 */
@@ -442,7 +442,7 @@ static int onenand_check_bufferram(struct mtd_info *mtd, loff_t addr)
442 struct onenand_chip *this = mtd->priv; 442 struct onenand_chip *this = mtd->priv;
443 int block, page; 443 int block, page;
444 int i; 444 int i;
445 445
446 block = (int) (addr >> this->erase_shift); 446 block = (int) (addr >> this->erase_shift);
447 page = (int) (addr >> this->page_shift); 447 page = (int) (addr >> this->page_shift);
448 page &= this->page_mask; 448 page &= this->page_mask;
@@ -472,7 +472,7 @@ static int onenand_update_bufferram(struct mtd_info *mtd, loff_t addr,
472 struct onenand_chip *this = mtd->priv; 472 struct onenand_chip *this = mtd->priv;
473 int block, page; 473 int block, page;
474 int i; 474 int i;
475 475
476 block = (int) (addr >> this->erase_shift); 476 block = (int) (addr >> this->erase_shift);
477 page = (int) (addr >> this->page_shift); 477 page = (int) (addr >> this->page_shift);
478 page &= this->page_mask; 478 page &= this->page_mask;
@@ -743,7 +743,7 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
743 743
744 if (memcmp(dataram0, dataram1, mtd->oobblock)) 744 if (memcmp(dataram0, dataram1, mtd->oobblock))
745 return -EBADMSG; 745 return -EBADMSG;
746 746
747 return 0; 747 return 0;
748} 748}
749#else 749#else
@@ -832,7 +832,7 @@ out:
832 onenand_release_device(mtd); 832 onenand_release_device(mtd);
833 833
834 *retlen = written; 834 *retlen = written;
835 835
836 return ret; 836 return ret;
837} 837}
838 838
@@ -917,7 +917,7 @@ out:
917 onenand_release_device(mtd); 917 onenand_release_device(mtd);
918 918
919 *retlen = written; 919 *retlen = written;
920 920
921 return 0; 921 return 0;
922} 922}
923 923
@@ -969,12 +969,12 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
969 onenand_get_device(mtd, FL_WRITING); 969 onenand_get_device(mtd, FL_WRITING);
970 970
971 /* TODO handling oob */ 971 /* TODO handling oob */
972 972
973 /* Loop until all keve's data has been written */ 973 /* Loop until all keve's data has been written */
974 len = 0; 974 len = 0;
975 while (count) { 975 while (count) {
976 pbuf = buffer; 976 pbuf = buffer;
977 /* 977 /*
978 * If the given tuple is >= pagesize then 978 * If the given tuple is >= pagesize then
979 * write it out from the iov 979 * write it out from the iov
980 */ 980 */
@@ -1316,7 +1316,7 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
1316 if (!(status & ONENAND_WP_US)) 1316 if (!(status & ONENAND_WP_US))
1317 printk(KERN_ERR "block = %d, wp status = 0x%x\n", block, status); 1317 printk(KERN_ERR "block = %d, wp status = 0x%x\n", block, status);
1318 } 1318 }
1319 1319
1320 return 0; 1320 return 0;
1321} 1321}
1322 1322
@@ -1439,7 +1439,7 @@ static int onenand_probe(struct mtd_info *mtd)
1439 printk(KERN_INFO "Lock scheme is Continues Lock\n"); 1439 printk(KERN_INFO "Lock scheme is Continues Lock\n");
1440 this->options |= ONENAND_CONT_LOCK; 1440 this->options |= ONENAND_CONT_LOCK;
1441 } 1441 }
1442 1442
1443 return 0; 1443 return 0;
1444} 1444}
1445 1445
@@ -1533,7 +1533,7 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
1533 } 1533 }
1534 1534
1535 memcpy(&mtd->oobinfo, this->autooob, sizeof(mtd->oobinfo)); 1535 memcpy(&mtd->oobinfo, this->autooob, sizeof(mtd->oobinfo));
1536 1536
1537 /* Fill in remaining MTD driver data */ 1537 /* Fill in remaining MTD driver data */
1538 mtd->type = MTD_NANDFLASH; 1538 mtd->type = MTD_NANDFLASH;
1539 mtd->flags = MTD_CAP_NANDFLASH | MTD_ECC; 1539 mtd->flags = MTD_CAP_NANDFLASH | MTD_ECC;