diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-07-18 18:00:57 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 15:59:52 +0200 |
| commit | 6910c1368104d50e6b6afc6c8b7e9d1670a374e7 (patch) | |
| tree | af6d9e591f4c985cb8977552ce3b805750ade2c7 /drivers/mtd/mtdpart.c | |
| parent | [MTD][MTDPART] Handle most checkpatch findings (diff) | |
| download | linux-6910c1368104d50e6b6afc6c8b7e9d1670a374e7.tar.xz linux-6910c1368104d50e6b6afc6c8b7e9d1670a374e7.zip | |
[MTD][MTDPART] Cleanup and document the erase region handling
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>
Diffstat (limited to 'drivers/mtd/mtdpart.c')
| -rw-r--r-- | drivers/mtd/mtdpart.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 9cf73d360e78..5aac59c21ead 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -424,18 +424,24 @@ static struct mtd_part *add_one_partition(struct mtd_info *master, } if (master->numeraseregions > 1) { /* 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; - /* Find the first erase regions which is part of this partition. */ - for (i = 0; i < master->numeraseregions && regions[i].offset <= slave->offset; i++) + /* Find the first erase regions which is part of this + * 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) { slave->mtd.erasesize = regions[i].erasesize; } } + BUG_ON(slave->mtd.erasesize == 0); } else { /* Single erase size */ slave->mtd.erasesize = master->erasesize; |