summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-05-17 15:36:39 +0300
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-05-20 20:26:03 +0300
commitd717dc2f85f07f68d313ac4f8f9f460f1e17dee0 (patch)
treec9797a46c3800b79a00106b7a4a3cad720c49452 /drivers/mtd/ubi
parentdcd85fdd1040259f0053137f252321faec0a259f (diff)
UBI: rename ubi_scan_rm_volume
The old name is not logical anymore - rename it to 'ubi_remove_av()'. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'drivers/mtd/ubi')
-rw-r--r--drivers/mtd/ubi/scan.c4
-rw-r--r--drivers/mtd/ubi/scan.h2
-rw-r--r--drivers/mtd/ubi/vtbl.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 767b857f305..ccf46308fbb 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/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/drivers/mtd/ubi/scan.h b/drivers/mtd/ubi/scan.h
index b1eeb0bda0e..7d7e65f11f1 100644
--- a/drivers/mtd/ubi/scan.h
+++ b/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/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 0c8c17282c8..cfe3830759b 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/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)