From: Boris Brezillon Date: Fri, 16 Sep 2016 14:59:16 +0000 (+0200) Subject: UBI: fastmap: use ubi_rb_for_each_entry() in unmap_peb() X-Git-Tag: v5.15~12680^2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2fb1346b3806a9b6b06cc80fe18760debc933f4;p=platform%2Fkernel%2Flinux-starfive.git UBI: fastmap: use ubi_rb_for_each_entry() in unmap_peb() Use the ubi_rb_for_each_entry() macro instead of open-coding it. Signed-off-by: Boris Brezillon Signed-off-by: Richard Weinberger --- diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index bae8069..1bfb4ae 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -385,12 +385,8 @@ static void unmap_peb(struct ubi_attach_info *ai, int pnum) struct rb_node *node, *node2; struct ubi_ainf_peb *aeb; - for (node = rb_first(&ai->volumes); node; node = rb_next(node)) { - av = rb_entry(node, struct ubi_ainf_volume, rb); - - for (node2 = rb_first(&av->root); node2; - node2 = rb_next(node2)) { - aeb = rb_entry(node2, struct ubi_ainf_peb, u.rb); + ubi_rb_for_each_entry(node, av, &ai->volumes, rb) { + ubi_rb_for_each_entry(node2, aeb, &av->root, u.rb) { if (aeb->pnum == pnum) { rb_erase(&aeb->u.rb, &av->root); av->leb_count--;