Skip to contentSkip to conversation

Clean up of code found when adding support for > 2GiB MTD devices

PATCH In review Bruce Leonard 2 participants 3 messages Aug 19, 2008 – Aug 27, 2008

Subsystems (2)
Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Bruce Leonard

author
#0 lore raw

PATCH 1/2 Clean up of code found when adding support for > 2GiB MTD devices

These are just some code cleanups that I found while working on the MTD sub-system.

From ab740d4e4b786a04a51b1de44e91f51919709e0a Mon Sep 17 00:00:00 2001
From: brucle <[email protected]>
Date: Wed, 13 Aug 2008 17:16:48 -0700
Subject: [PATCH] Code clean up preping for support of > 2GiB MTD devices

Signed-off-by Bruce D. Leonard <[email protected]>
---
 drivers/mtd/nand/nand_base.c |    2 +-
 drivers/mtd/nand/nand_bbt.c  |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/mtd/nand/nand_base.c +1 -1
index d1129ba..d5ac675 100644
@@ -2042,7 +2042,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
 		return -EINVAL;
 	}
 
-	instr->fail_addr = 0xffffffff;
+	instr->fail_addr = (typeof(instr->fail_addr))(-1);
 
 	/* Grab the lock and see if the device is available */
 	nand_get_device(chip, mtd, FL_ERASING);
drivers/mtd/nand/nand_bbt.c +2 -3
index 0b1c485..2f9f0f5 100644
@@ -411,7 +411,7 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf,
 		numblocks = this->chipsize >> (this->bbt_erase_shift - 1);
 		startblock = chip * numblocks;
 		numblocks += startblock;
-		from = startblock << (this->bbt_erase_shift - 1);
+		from = (loff_t)startblock << (this->bbt_erase_shift - 1);
 	}
 
 	for (i = startblock; i < numblocks;) {

@@ -495,7 +495,7 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
 		for (block = 0; block < td->maxblocks; block++) {
 
 			int actblock = startblock + dir * block;
-			loff_t offs = actblock << this->bbt_erase_shift;
+			loff_t offs = (loff_t)actblock << this->bbt_erase_shift;
 
 			/* Read first page */
 			scan_read_raw(mtd, buf, offs, mtd->writesize);

@@ -1027,7 +1027,6 @@ int nand_update_bbt(struct mtd_info *mtd, loff_t offs)
 	if (!this->bbt || !td)
 		return -EINVAL;
 
-	len = mtd->size >> (this->bbt_erase_shift + 2);
 	/* Allocate a temporary buffer for one eraseblock incl. oob */
 	len = (1 << this->bbt_erase_shift);
 	len += (len >> this->page_shift) * mtd->oobsize;
Signature · 1 line
1.5.3.4
Acked-by on v1 1/2
#1 lore raw

Hi,

Quoted 6 lines · Bruce Leonard

These are just some code cleanups that I found while working on the MTD sub-system.
From: brucle <[email protected]>
Date: Wed, 13 Aug 2008 17:16:48 -0700
Subject: [PATCH] Code clean up preping for support of > 2GiB MTD devices

Signed-off-by Bruce D. Leonard <[email protected]>

For this clean-up patch,

Acked-by Artem Bityutskiy <[email protected]>

However, are you shure it is against the mtd-2.6.git tree?

Signature · 2 lines
Best regards,
Artem Bityutskiy (Битюцкий Артём)
author
#2 lore raw

Artem,

Quoted 8 lines · Artem Bityutskiy

Hi,

Quoted 5 lines · Bruce Leonard

These are just some code cleanups that I found while working on the MTD sub-system.
From: brucle <[email protected]>
Date: Wed, 13 Aug 2008 17:16:48 -0700
Subject: [PATCH] Code clean up preping for support of > 2GiB MTD devices

Quoted 7 lines
Quoted 1 line
Signed-off-by Bruce D. Leonard <[email protected]>

For this clean-up patch,

Acked-by Artem Bityutskiy <[email protected]>

However, are you shure it is against the mtd-2.6.git tree?

This patch set is against the mainline, 2.6.27-rc3. At the time I posted the patch I was only a day or two out from pulling the latest from Linus' tree. It's now a couple of weeks out of date I think.

Bruce