From 1b7864b55ead47d85e3f5b3c929a331239cca7b5 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Thu, 17 May 2012 15:36:39 +0300 Subject: [PATCH] --- yaml --- r: 305176 b: refs/heads/master c: d717dc2f85f07f68d313ac4f8f9f460f1e17dee0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/ubi/scan.c | 4 ++-- trunk/drivers/mtd/ubi/scan.h | 2 +- trunk/drivers/mtd/ubi/vtbl.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4c1c0ae72fb6..8ad5a619445f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcd85fdd1040259f0053137f252321faec0a259f +refs/heads/master: d717dc2f85f07f68d313ac4f8f9f460f1e17dee0 diff --git a/trunk/drivers/mtd/ubi/scan.c b/trunk/drivers/mtd/ubi/scan.c index 767b857f3054..ccf46308fbb6 100644 --- a/trunk/drivers/mtd/ubi/scan.c +++ b/trunk/drivers/mtd/ubi/scan.c @@ -614,11 +614,11 @@ struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai, } /** - * ubi_scan_rm_volume - delete attaching information about a volume. + * ubi_remove_av - delete attaching information about a volume. * @ai: attaching information * @av: the volume attaching information to delete */ -void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av) +void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av) { struct rb_node *rb; struct ubi_ainf_peb *aeb; diff --git a/trunk/drivers/mtd/ubi/scan.h b/trunk/drivers/mtd/ubi/scan.h index b1eeb0bda0e7..7d7e65f11f14 100644 --- a/trunk/drivers/mtd/ubi/scan.h +++ b/trunk/drivers/mtd/ubi/scan.h @@ -161,7 +161,7 @@ int ubi_add_to_av(struct ubi_device *ubi, struct ubi_attach_info *ai, int pnum, int ec, const struct ubi_vid_hdr *vid_hdr, int bitflips); struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai, int vol_id); -void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av); +void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av); struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi, struct ubi_attach_info *ai); struct ubi_attach_info *ubi_scan(struct ubi_device *ubi); diff --git a/trunk/drivers/mtd/ubi/vtbl.c b/trunk/drivers/mtd/ubi/vtbl.c index 0c8c17282c81..cfe3830759bd 100644 --- a/trunk/drivers/mtd/ubi/vtbl.c +++ b/trunk/drivers/mtd/ubi/vtbl.c @@ -738,7 +738,7 @@ static int check_scanning_info(const struct ubi_device *ubi, vol = ubi->volumes[i]; if (!vol) { if (av) - ubi_scan_rm_volume(ai, av); + ubi_remove_av(ai, av); continue; } @@ -756,7 +756,7 @@ static int check_scanning_info(const struct ubi_device *ubi, * these eraseblocks. */ ubi_msg("finish volume %d removal", av->vol_id); - ubi_scan_rm_volume(ai, av); + ubi_remove_av(ai, av); } else if (av) { err = check_av(vol, av); if (err)