diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-05-17 15:41:12 +0300 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-05-20 20:26:03 +0300 |
commit | 66a2af3824d856684b9865f140998a134eb4c6d8 (patch) | |
tree | 9cc410f80a9921a94222a0925da090794f6f7a53 | |
parent | c87fbd7deb08315314654de5360c102acc8716ee (diff) |
UBI: rename ubi_scan_destroy_ai
The old name is not logical anymore - rename it to 'ubi_destroy_ai()'.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rw-r--r-- | drivers/mtd/ubi/build.c | 4 | ||||
-rw-r--r-- | drivers/mtd/ubi/scan.c | 6 | ||||
-rw-r--r-- | drivers/mtd/ubi/scan.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 1ae3cfa30809..2a8f26b560f6 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -608,7 +608,7 @@ static int attach_by_scanning(struct ubi_device *ubi) if (err) goto out_wl; - ubi_scan_destroy_ai(ai); + ubi_destroy_ai(ai); return 0; out_wl: @@ -617,7 +617,7 @@ out_vtbl: free_internal_volumes(ubi); vfree(ubi->vtbl); out_ai: - ubi_scan_destroy_ai(ai); + ubi_destroy_ai(ai); return err; } diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index 2c5a558dc844..daa53a8fca88 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c @@ -1203,7 +1203,7 @@ out_vidh: out_ech: kfree(ech); out_ai: - ubi_scan_destroy_ai(ai); + ubi_destroy_ai(ai); return ERR_PTR(err); } @@ -1242,10 +1242,10 @@ static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av) } /** - * ubi_scan_destroy_ai - destroy attaching information. + * ubi_destroy_ai - destroy attaching information. * @ai: attaching information */ -void ubi_scan_destroy_ai(struct ubi_attach_info *ai) +void ubi_destroy_ai(struct ubi_attach_info *ai) { struct ubi_ainf_peb *aeb, *aeb_tmp; struct ubi_ainf_volume *av; diff --git a/drivers/mtd/ubi/scan.h b/drivers/mtd/ubi/scan.h index 72ba24a13a72..a406f5b4ffeb 100644 --- a/drivers/mtd/ubi/scan.h +++ b/drivers/mtd/ubi/scan.h @@ -165,6 +165,6 @@ void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av); struct ubi_ainf_peb *ubi_early_get_peb(struct ubi_device *ubi, struct ubi_attach_info *ai); struct ubi_attach_info *ubi_scan(struct ubi_device *ubi); -void ubi_scan_destroy_ai(struct ubi_attach_info *ai); +void ubi_destroy_ai(struct ubi_attach_info *ai); #endif /* !__UBI_SCAN_H__ */ |