aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-05-17 08:38:56 -0400
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-05-20 13:26:03 -0400
commitc87fbd7deb08315314654de5360c102acc8716ee (patch)
treef1f541353b11b5ccadbab8ec2c59db7e03398c61 /drivers/mtd
parentd717dc2f85f07f68d313ac4f8f9f460f1e17dee0 (diff)
UBI: rename ubi_scan_get_free_peb
The old name is not logical anymore - rename it to 'ubi_early_get_peb()'. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/scan.c6
-rw-r--r--drivers/mtd/ubi/scan.h4
-rw-r--r--drivers/mtd/ubi/vtbl.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index ccf46308fbb6..2c5a558dc844 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -682,7 +682,7 @@ out_free:
682} 682}
683 683
684/** 684/**
685 * ubi_scan_get_free_peb - get a free physical eraseblock. 685 * ubi_early_get_peb - get a free physical eraseblock.
686 * @ubi: UBI device description object 686 * @ubi: UBI device description object
687 * @ai: attaching information 687 * @ai: attaching information
688 * 688 *
@@ -695,8 +695,8 @@ out_free:
695 * This function returns scanning physical eraseblock information in case of 695 * This function returns scanning physical eraseblock information in case of
696 * success and an error code in case of failure. 696 * success and an error code in case of failure.
697 */ 697 */
698struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi, 698struct ubi_ainf_peb *ubi_early_get_peb(struct ubi_device *ubi,
699 struct ubi_attach_info *ai) 699 struct ubi_attach_info *ai)
700{ 700{
701 int err = 0; 701 int err = 0;
702 struct ubi_ainf_peb *aeb, *tmp_aeb; 702 struct ubi_ainf_peb *aeb, *tmp_aeb;
diff --git a/drivers/mtd/ubi/scan.h b/drivers/mtd/ubi/scan.h
index 7d7e65f11f14..72ba24a13a72 100644
--- a/drivers/mtd/ubi/scan.h
+++ b/drivers/mtd/ubi/scan.h
@@ -162,8 +162,8 @@ int ubi_add_to_av(struct ubi_device *ubi, struct ubi_attach_info *ai, int pnum,
162struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai, 162struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,
163 int vol_id); 163 int vol_id);
164void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av); 164void ubi_remove_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av);
165struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi, 165struct ubi_ainf_peb *ubi_early_get_peb(struct ubi_device *ubi,
166 struct ubi_attach_info *ai); 166 struct ubi_attach_info *ai);
167struct ubi_attach_info *ubi_scan(struct ubi_device *ubi); 167struct ubi_attach_info *ubi_scan(struct ubi_device *ubi);
168void ubi_scan_destroy_ai(struct ubi_attach_info *ai); 168void ubi_scan_destroy_ai(struct ubi_attach_info *ai);
169 169
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index cfe3830759bd..341c956c8cdb 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -312,7 +312,7 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_attach_info *ai,
312 return -ENOMEM; 312 return -ENOMEM;
313 313
314retry: 314retry:
315 new_aeb = ubi_scan_get_free_peb(ubi, ai); 315 new_aeb = ubi_early_get_peb(ubi, ai);
316 if (IS_ERR(new_aeb)) { 316 if (IS_ERR(new_aeb)) {
317 err = PTR_ERR(new_aeb); 317 err = PTR_ERR(new_aeb);
318 goto out_free; 318 goto out_free;