From: Richard Weinberger <richard@nod.at>
To: linux-mtd@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, adrian.hunter@intel.com,
Heinz.Egger@linutronix.de, thomas.wucher@linutronix.de,
shmulik.ladkani@gmail.com, tglx@linutronix.de,
tim.bird@am.sony.com, Marius.Mazarel@ugal.ro,
artem.bityutskiy@linux.intel.com, nyoushchenko@mvista.com,
Richard Weinberger <richard@nod.at>
Subject: [PATCH 08/11] ubi: fastmap: Remove 'ubi' parameter of 'destroy_ai()'
Date: Fri, 29 Jun 2012 17:14:26 +0200 [thread overview]
Message-ID: <1340982869-77042-9-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1340982869-77042-1-git-send-email-richard@nod.at>
From: Shmulik Ladkani <shmulik.ladkani@gmail.com>
The 'ubi' argument of 'destroy_ai' was added during fastmap development,
but it is no longer used.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
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;
}
--
1.7.6.5
next prev parent reply other threads:[~2012-06-29 15:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 15:14 UBI fastmap updates Richard Weinberger
2012-06-29 15:14 ` [PATCH 01/11] UBI: Fastmap: Fix mem leak in error path Richard Weinberger
2012-06-29 15:14 ` [PATCH 02/11] UBI: Fastmap: Amend self_check_eba() Richard Weinberger
2012-06-29 15:14 ` [PATCH 03/11] UBI: Fastmap: Remove forward declaration Richard Weinberger
2012-06-29 15:14 ` [PATCH 04/11] UBI: Fastmap: Move fastmap specific code into ubi_scan_fastmap() Richard Weinberger
2012-06-29 15:14 ` [PATCH 05/11] UBI: Fastmap: Kill TODO Richard Weinberger
2012-06-29 15:14 ` [PATCH 06/11] UBI: Fastmap: Remove unused variable Richard Weinberger
2012-06-29 15:14 ` [PATCH 07/11] UBI: Fastmap: Fix scan regression Richard Weinberger
2012-06-29 15:14 ` Richard Weinberger [this message]
2012-06-29 15:14 ` [PATCH 09/11] ubi: fastmap: Do not free 'ai' in 'scan_all()' Richard Weinberger
2012-06-29 15:14 ` [PATCH 10/11] UBI: Fastmap: Disable fastmap per default Richard Weinberger
2012-06-29 15:14 ` [PATCH 11/11] UBI: Fastmap: Add a module parameter to enable fastmap Richard Weinberger
2012-07-01 6:28 ` Rusty Russell
2012-07-01 9:41 ` Richard Weinberger
2012-06-30 10:43 ` UBI fastmap updates Artem Bityutskiy
2012-06-30 10:53 ` Richard Weinberger
2012-06-30 11:24 ` Artem Bityutskiy
2012-06-30 14:24 ` Artem Bityutskiy
2012-07-08 11:47 ` Shmulik Ladkani
2012-07-08 12:07 ` Richard Weinberger
2012-07-08 15:11 ` Richard Weinberger
2012-07-09 7:37 ` Shmulik Ladkani
2012-07-09 8:19 ` Richard Weinberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340982869-77042-9-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=Heinz.Egger@linutronix.de \
--cc=Marius.Mazarel@ugal.ro \
--cc=adrian.hunter@intel.com \
--cc=artem.bityutskiy@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=nyoushchenko@mvista.com \
--cc=shmulik.ladkani@gmail.com \
--cc=tglx@linutronix.de \
--cc=thomas.wucher@linutronix.de \
--cc=tim.bird@am.sony.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).