From patchwork Mon Nov 12 09:52:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 198349 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B7512C0089 for ; Mon, 12 Nov 2012 20:53:30 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TXqhM-00019z-Ar; Mon, 12 Nov 2012 09:52:56 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TXqh3-00014O-5W for linux-mtd@lists.infradead.org; Mon, 12 Nov 2012 09:52:38 +0000 Received: by mail-bk0-f49.google.com with SMTP id j4so2247427bkw.36 for ; Mon, 12 Nov 2012 01:52:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=38fStG+53NhBXIDovzCUIIIj9F4PD//Jj0dMBlW6W10=; b=QeSDR9CiMq5pMVHjRPKLzr06P5lYQbjoxeLgBoH1WHJ06117JDcXhyOqNZ6BmoCJXp yuewjC9Ig1Ti3x5nh2rVsaJbQOK0CCOe4bmj3fqMkBOnryxoPSGHgCnYS9ZBCM+IQCP7 KBsv6S6KN197gJ/84uyweG1FS8Ox9kS23KtBYWTuqlojL9Rt2rdEjIhCp/X/jQaoltJg jDSNbqZsBEg73WUIbuYHDqO+otEUK3N0MM0gZB2CE+jPl75dzC7gc0nZ2RJknPjo1zBg KLkvzl6pCBsNUxl8xPGsAirpjODG3Nz6hBZYMYdfIphSgI7RGLm7u9cse1/BhVXpEw62 dLXg== Received: by 10.204.151.201 with SMTP id d9mr1763339bkw.90.1352713956790; Mon, 12 Nov 2012 01:52:36 -0800 (PST) Received: from shaker64.lan (dslb-088-073-158-247.pools.arcor-ip.net. [88.73.158.247]) by mx.google.com with ESMTPS id hm4sm431232bkc.7.2012.11.12.01.52.35 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 01:52:36 -0800 (PST) From: Jonas Gorski To: linux-mtd@lists.infradead.org Subject: [PATCH 2/5] MTD: bcm63xxpart: merge sparelen calculation Date: Mon, 12 Nov 2012 10:52:48 +0100 Message-Id: <1352713971-1685-3-git-send-email-jonas.gorski@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1352713971-1685-1-git-send-email-jonas.gorski@gmail.com> References: <1352713971-1685-1-git-send-email-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121112_045237_544552_B8FAAE90 X-CRM114-Status: GOOD ( 12.93 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jonas.gorski[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Maxime Bizon , Kevin Cernekee , David Woodhouse , Florian Fainelli , Artem Bityutskiy X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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)