From patchwork Mon Nov 12 09:52:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/5] MTD: bcm63xxpart: merge sparelen calculation Date: Sun, 11 Nov 2012 23:52:48 -0000 From: Jonas Gorski X-Patchwork-Id: 198349 Message-Id: <1352713971-1685-3-git-send-email-jonas.gorski@gmail.com> To: linux-mtd@lists.infradead.org Cc: Maxime Bizon , Kevin Cernekee , David Woodhouse , Florian Fainelli , Artem Bityutskiy The length of the spare part is calculated the same way in both branches so move to a common place. Signed-off-by: Jonas Gorski --- drivers/mtd/bcm63xxpart.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c index 1eb1416..ba7eeb8 100644 --- a/drivers/mtd/bcm63xxpart.c +++ b/drivers/mtd/bcm63xxpart.c @@ -120,7 +120,6 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE; rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE; spareaddr = roundup(totallen, master->erasesize) + cfelen; - sparelen = master->size - spareaddr - nvramlen; if (rootfsaddr < kerneladdr) { /* default Broadcom layout */ @@ -138,8 +137,8 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, rootfslen = 0; rootfsaddr = 0; spareaddr = cfelen; - sparelen = master->size - cfelen - nvramlen; } + sparelen = master->size - spareaddr - nvramlen; /* Determine number of partitions */ if (rootfslen > 0)