summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyungmin Park <kyungmin.park@samsung.com>2007-01-31 14:25:21 +0900
committerKyungmin Park <kyungmin.park@samsung.com>2007-01-31 14:25:21 +0900
commit9bfbc9b24f663b15149874a94a69ba89b3b7e44c (patch)
treee2d62964745439feccea110375e97bce2a0ae60e
parent8b29c0b6eb3a4952e7eae03038bbf6c1695dfe80 (diff)
downloadlinux-stable-9bfbc9b24f663b15149874a94a69ba89b3b7e44c.tar.gz
linux-stable-9bfbc9b24f663b15149874a94a69ba89b3b7e44c.tar.bz2
linux-stable-9bfbc9b24f663b15149874a94a69ba89b3b7e44c.zip
[MTD] OneNAND: Remove unused fields
- Remove unused fields - Fix typo Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
-rw-r--r--drivers/mtd/onenand/onenand_base.c5
-rw-r--r--include/linux/mtd/onenand.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 65acb85830d3..daf298948b9b 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1966,13 +1966,12 @@ static int onenand_probe(struct mtd_info *mtd)
/* The data buffer size is equal to page size */
mtd->writesize = this->read_word(this->base + ONENAND_REG_DATA_BUFFER_SIZE);
mtd->oobsize = mtd->writesize >> 5;
- /* Pagers per block is always 64 in OneNAND */
+ /* Pages per a block are always 64 in OneNAND */
mtd->erasesize = mtd->writesize << 6;
this->erase_shift = ffs(mtd->erasesize) - 1;
this->page_shift = ffs(mtd->writesize) - 1;
- this->ppb_shift = (this->erase_shift - this->page_shift);
- this->page_mask = (mtd->erasesize / mtd->writesize) - 1;
+ this->page_mask = (1 << (this->erase_shift - this->page_shift)) - 1;
/* REVIST: Multichip handling */
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index 60b3534de74d..a5e6c4bf7af3 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -63,7 +63,6 @@ struct onenand_bufferram {
* partly be set to inform onenand_scan about
* @erase_shift: [INTERN] number of address bits in a block
* @page_shift: [INTERN] number of address bits in a page
- * @ppb_shift: [INTERN] number of address bits in a pages per block
* @page_mask: [INTERN] a page per block mask
* @bufferram_index: [INTERN] BufferRAM index
* @bufferram: [INTERN] BufferRAM info
@@ -103,7 +102,6 @@ struct onenand_chip {
unsigned int erase_shift;
unsigned int page_shift;
- unsigned int ppb_shift; /* Pages per block shift */
unsigned int page_mask;
unsigned int bufferram_index;