From patchwork Fri Jun 29 15:14:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 168141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 614CD1007D4 for ; Sat, 30 Jun 2012 01:16:58 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Skcur-0006bc-Jr; Fri, 29 Jun 2012 15:15:25 +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 1SkcuD-0006SJ-Fr for linux-mtd@lists.infradead.org; Fri, 29 Jun 2012 15:14:46 +0000 Received: (qmail 20830 invoked by uid 89); 29 Jun 2012 15:14:45 -0000 Received: by simscan 1.3.1 ppid: 20657, pid: 20827, t: 0.1258s 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; 29 Jun 2012 15:14:45 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 08/11] ubi: fastmap: Remove 'ubi' parameter of 'destroy_ai()' Date: Fri, 29 Jun 2012 17:14:26 +0200 Message-Id: <1340982869-77042-9-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1340982869-77042-1-git-send-email-richard@nod.at> References: <1340982869-77042-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: nyoushchenko@mvista.com, artem.bityutskiy@linux.intel.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, Heinz.Egger@linutronix.de, thomas.wucher@linutronix.de, shmulik.ladkani@gmail.com, Richard Weinberger , tglx@linutronix.de, Marius.Mazarel@ugal.ro, 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 From: Shmulik Ladkani The 'ubi' argument of 'destroy_ai' was added during fastmap development, but it is no longer used. Signed-off-by: Shmulik Ladkani Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/attach.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index bc1e4bf..c30a0f6 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -1164,10 +1164,9 @@ static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av) /** * destroy_ai - destroy attaching information. - * @ubi: UBI device object * @ai: attaching information */ -static void destroy_ai(struct ubi_device *ubi, struct ubi_attach_info *ai) +static void destroy_ai(struct ubi_attach_info *ai) { struct ubi_ainf_peb *aeb, *aeb_tmp; struct ubi_ainf_volume *av; @@ -1300,7 +1299,7 @@ out_vidh: out_ech: kfree(ech); out_ai: - destroy_ai(ubi, ai); + destroy_ai(ai); return err; } @@ -1353,7 +1352,7 @@ out_vidh: out_ech: kfree(ech); out_ai: - destroy_ai(ubi, ai); + destroy_ai(ai); return err; } static struct ubi_attach_info *alloc_ai(void) @@ -1403,7 +1402,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) err = scan_fast(ubi, ai); if (err > 0) { if (err != UBI_NO_FASTMAP) { - destroy_ai(ubi, ai); + destroy_ai(ai); ai = alloc_ai(); if (!ai) return -ENOMEM; @@ -1449,13 +1448,13 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) } err = self_check_eba(ubi, ai, scan_ai); - destroy_ai(ubi, scan_ai); + destroy_ai(scan_ai); if (err) goto out_wl; } - destroy_ai(ubi, ai); + destroy_ai(ai); return 0; out_wl: @@ -1464,7 +1463,7 @@ out_vtbl: ubi_free_internal_volumes(ubi); vfree(ubi->vtbl); out_ai: - destroy_ai(ubi, ai); + destroy_ai(ai); return err; }