From patchwork Wed Jun 13 10:42:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 164634 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 D3BF5B6FD3 for ; Wed, 13 Jun 2012 20:46:02 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sel42-00089C-DE; Wed, 13 Jun 2012 10:44:39 +0000 Received: from a.ns.miles-group.at ([95.130.255.143] helo=radon.swed.at) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sel2F-0007CE-62 for linux-mtd@lists.infradead.org; Wed, 13 Jun 2012 10:42:52 +0000 Received: (qmail 12405 invoked by uid 89); 13 Jun 2012 10:42:46 -0000 Received: by simscan 1.3.1 ppid: 12079, pid: 12402, t: 0.1294s scanners: attach: 1.3.1 clamav: 0.96.5/m:53 Received: from unknown (HELO localhost.localdomain) (richard@nod.at@212.62.202.73) by radon.swed.at with ESMTPA; 13 Jun 2012 10:42:46 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 21/21] UBI: Fastmap: make checkpatch.pl happy Signed-off-by: Richard Weinberger Date: Wed, 13 Jun 2012 12:42:18 +0200 Message-Id: <1339584138-69914-22-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1339584138-69914-1-git-send-email-richard@nod.at> References: <1339584138-69914-1-git-send-email-richard@nod.at> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Richard Weinberger , adrian.hunter@intel.com, Heinz.Egger@linutronix.de, shmulik.ladkani@gmail.com, tglx@linutronix.de, tim.bird@am.sony.com 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 Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/fastmap.c | 10 ++++++---- drivers/mtd/ubi/wl.c | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index ecc313d..8b033e5 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -402,12 +402,13 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, err = ubi_io_read_vid_hdr(ubi, pnum, vh, 0); if (err == UBI_IO_FF || err == UBI_IO_FF_BITFLIPS) { + unsigned long long ec = be64_to_cpu(ech->ec); unmap_peb(ai, pnum); dbg_bld("Adding PEB to free: %i", pnum); if (err == UBI_IO_FF_BITFLIPS) - add_aeb(ai, &ai->free, pnum, be64_to_cpu(ech->ec), 1); + add_aeb(ai, &ai->free, pnum, ec, 1); else - add_aeb(ai, &ai->free, pnum, be64_to_cpu(ech->ec), 0); + add_aeb(ai, &ai->free, pnum, ec, 0); continue; } else if (err == 0 || err == UBI_IO_BITFLIPS) { dbg_bld("Found non empty PEB:%i in pool", pnum); @@ -575,7 +576,8 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, av = add_vol(ai, be32_to_cpu(fmvhdr->vol_id), be32_to_cpu(fmvhdr->used_ebs), be32_to_cpu(fmvhdr->data_pad), - fmvhdr->vol_type, be32_to_cpu(fmvhdr->last_eb_bytes)); + fmvhdr->vol_type, + be32_to_cpu(fmvhdr->last_eb_bytes)); if (!av) goto fail_bad; @@ -688,7 +690,7 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) { list_del(&tmp_aeb->u.list); - dbg_bld("adding PEB from used to erase list: %i", tmp_aeb->pnum); + dbg_bld("moving PEB from used to erase: %i", tmp_aeb->pnum); add_aeb(ai, &ai->erase, tmp_aeb->pnum, tmp_aeb->ec, 0); kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); } diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index c4d8273..a64cd83 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -827,7 +827,8 @@ static int do_sync_erase(struct ubi_device *ubi, struct ubi_wl_entry *e, * * see: ubi_wl_put_peb() */ -int ubi_wl_put_fm_peb(struct ubi_device *ubi, struct ubi_wl_entry *used_e, int torture) +int ubi_wl_put_fm_peb(struct ubi_device *ubi, struct ubi_wl_entry *used_e, + int torture) { struct ubi_wl_entry *e; int pnum = used_e->pnum;