From 653e47ae9853c443b2d3b8143e320f101210d78f Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Thu, 17 May 2012 15:20:28 +0300 Subject: [PATCH] --- yaml --- r: 305172 b: refs/heads/master c: 13d33dad35c2a168d17cc993ea496b8eb9dd9624 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/ubi/scan.c | 8 ++++---- trunk/drivers/mtd/ubi/scan.h | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b2ff075d8ead..7e1e66b2cce9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 517af48c0540e61bbe0ebbb5f463afe937b73894 +refs/heads/master: 13d33dad35c2a168d17cc993ea496b8eb9dd9624 diff --git a/trunk/drivers/mtd/ubi/scan.c b/trunk/drivers/mtd/ubi/scan.c index 795d5ed70424..c5501652fdf9 100644 --- a/trunk/drivers/mtd/ubi/scan.c +++ b/trunk/drivers/mtd/ubi/scan.c @@ -667,7 +667,7 @@ void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av) } /** - * ubi_scan_erase_peb - erase a physical eraseblock. + * early_erase_peb - erase a physical eraseblock. * @ubi: UBI device description object * @ai: attaching information * @pnum: physical eraseblock number to erase; @@ -679,8 +679,8 @@ void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av) * This function returns zero in case of success and a negative error code in * case of failure. */ -int ubi_scan_erase_peb(struct ubi_device *ubi, const struct ubi_attach_info *ai, - int pnum, int ec) +static int early_erase_peb(struct ubi_device *ubi, + const struct ubi_attach_info *ai, int pnum, int ec) { int err; struct ubi_ec_hdr *ec_hdr; @@ -748,7 +748,7 @@ struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi, if (aeb->ec == UBI_SCAN_UNKNOWN_EC) aeb->ec = ai->mean_ec; - err = ubi_scan_erase_peb(ubi, ai, aeb->pnum, aeb->ec+1); + err = early_erase_peb(ubi, ai, aeb->pnum, aeb->ec+1); if (err) continue; diff --git a/trunk/drivers/mtd/ubi/scan.h b/trunk/drivers/mtd/ubi/scan.h index 3e19cb665a55..59ed0750cef8 100644 --- a/trunk/drivers/mtd/ubi/scan.h +++ b/trunk/drivers/mtd/ubi/scan.h @@ -167,8 +167,6 @@ struct ubi_ainf_peb *ubi_scan_find_aeb(const struct ubi_ainf_volume *av, void ubi_scan_rm_volume(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); -int ubi_scan_erase_peb(struct ubi_device *ubi, const struct ubi_attach_info *ai, - int pnum, int ec); struct ubi_attach_info *ubi_scan(struct ubi_device *ubi); void ubi_scan_destroy_ai(struct ubi_attach_info *ai);