Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[MTD][MTDPART] Cleanup and document the erase region handling

Browse source 
Mostly simplifying the loops.  Now everything fits into 80 columns,
is easier to read and the finer details have extra comments.

Signed-off-by: Jörn Engel <joern@logfs.org>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Atsushi Nemoto 2008-07-19 01:00:57 +09:00 committed by David Woodhouse
parent b33a288739
commit 6910c13681
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/mtd/mtdpart.c
View file

@ -424,18 +424,24 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
} }
if (master->numeraseregions > 1) { if (master->numeraseregions > 1) {
/* Deal with variable erase size stuff */ /* Deal with variable erase size stuff */
int i; int i, max = master->numeraseregions;
u32 end = slave->offset + slave->mtd.size;
struct mtd_erase_region_info *regions = master->eraseregions; struct mtd_erase_region_info *regions = master->eraseregions;
/* Find the first erase regions which is part of this partition. */ /* Find the first erase regions which is part of this
for (i = 0; i < master->numeraseregions && regions[i].offset <= slave->offset; i++) * partition. */
for (i = 0; i < max && regions[i].offset <= slave->offset; i++)
; ;
/* The loop searched for the region _behind_ the first one */
i--;
for (i--; i < master->numeraseregions && regions[i].offset < slave->offset + slave->mtd.size; i++) { /* Pick biggest erasesize */
for (; i < max && regions[i].offset < end; i++) {
if (slave->mtd.erasesize < regions[i].erasesize) { if (slave->mtd.erasesize < regions[i].erasesize) {
slave->mtd.erasesize = regions[i].erasesize; slave->mtd.erasesize = regions[i].erasesize;
} }
} }
BUG_ON(slave->mtd.erasesize == 0);
} else { } else {
/* Single erase size */ /* Single erase size */
slave->mtd.erasesize = master->erasesize; slave->mtd.erasesize = master->erasesize;