diff --git a/[refs] b/[refs] index 7e1e66b2cce9..e68328a5f287 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13d33dad35c2a168d17cc993ea496b8eb9dd9624 +refs/heads/master: ee663d929213c9f7e55c45229e9a01eeb8335b50 diff --git a/trunk/drivers/mtd/ubi/scan.c b/trunk/drivers/mtd/ubi/scan.c index c5501652fdf9..06151fde2cc7 100644 --- a/trunk/drivers/mtd/ubi/scan.c +++ b/trunk/drivers/mtd/ubi/scan.c @@ -614,35 +614,6 @@ struct ubi_ainf_volume *ubi_scan_find_av(const struct ubi_attach_info *ai, return NULL; } -/** - * ubi_scan_find_aeb - find LEB in the volume attaching information. - * @av: a pointer to the volume attaching information - * @lnum: the requested logical eraseblock - * - * This function returns a pointer to the scanning logical eraseblock or %NULL - * if there are no data about it in the scanning volume information. - */ -struct ubi_ainf_peb *ubi_scan_find_aeb(const struct ubi_ainf_volume *av, - int lnum) -{ - struct ubi_ainf_peb *aeb; - struct rb_node *p = av->root.rb_node; - - while (p) { - aeb = rb_entry(p, struct ubi_ainf_peb, u.rb); - - if (lnum == aeb->lnum) - return aeb; - - if (lnum > aeb->lnum) - p = p->rb_left; - else - p = p->rb_right; - } - - return NULL; -} - /** * ubi_scan_rm_volume - delete attaching information about a volume. * @ai: attaching information diff --git a/trunk/drivers/mtd/ubi/scan.h b/trunk/drivers/mtd/ubi/scan.h index 59ed0750cef8..ef6e903be8e0 100644 --- a/trunk/drivers/mtd/ubi/scan.h +++ b/trunk/drivers/mtd/ubi/scan.h @@ -162,8 +162,6 @@ int ubi_scan_add_used(struct ubi_device *ubi, struct ubi_attach_info *ai, int bitflips); struct ubi_ainf_volume *ubi_scan_find_av(const struct ubi_attach_info *ai, int vol_id); -struct ubi_ainf_peb *ubi_scan_find_aeb(const struct ubi_ainf_volume *av, - int lnum); 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);