Commit e190401b authored by Jonas Gorski's avatar Jonas Gorski Committed by Artem Bityutskiy
Browse files

mtd: bcm63xxpart: merge sparelen calculation 



The length of the spare part is calculated the same way in both branches
so move to a common place.

Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent fafc3d68

drivers/mtd/bcm63xxpart.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE