From 050fce36f184f223bac59106babc072b1729328e Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Wed, 31 Jan 2007 14:25:21 +0900 Subject: [PATCH] --- yaml --- r: 49135 b: refs/heads/master c: 9bfbc9b24f663b15149874a94a69ba89b3b7e44c h: refs/heads/master i: 49133: 7320c32bf23078c52d42e0d05951e0e97fe2610f 49131: 7f0f5959a324e0b8d4902f8c9285584ea79de2fa 49127: 4f239a1a2caa462ab14713be7c0c9c37507091c9 49119: 63cbc8a914c8a4385059f52cae17329c6c7bac0b v: v3 --- [refs] | 2 +- trunk/drivers/mtd/onenand/onenand_base.c | 5 ++--- trunk/include/linux/mtd/onenand.h | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7cfb464b3ad6..5605dc071184 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b29c0b6eb3a4952e7eae03038bbf6c1695dfe80 +refs/heads/master: 9bfbc9b24f663b15149874a94a69ba89b3b7e44c diff --git a/trunk/drivers/mtd/onenand/onenand_base.c b/trunk/drivers/mtd/onenand/onenand_base.c index 65acb85830d3..daf298948b9b 100644 --- a/trunk/drivers/mtd/onenand/onenand_base.c +++ b/trunk/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/trunk/include/linux/mtd/onenand.h b/trunk/include/linux/mtd/onenand.h index 60b3534de74d..a5e6c4bf7af3 100644 --- a/trunk/include/linux/mtd/onenand.h +++ b/trunk/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;